Skip to content

Conversation

@dveeden
Copy link
Contributor

@dveeden dveeden commented Aug 2, 2025

What problem does this PR solve?

ref #2508

What is changed and how it works?

  • Replace github.com/alecthomas/assert with github.com/stretchr/testify/require
  • This removes one direct dependency and two indirect ones
  • This makes test more similar to other tests

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Code changes

  • Has exported function/method change
  • Has exported variable/fields change
  • Has interface methods change
  • Has persistent data change

Side effects

  • Possible performance regression
  • Increased code complexity
  • Breaking backward compatibility

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation

Release notes:

NONE

@ti-chi-bot ti-chi-bot bot requested a review from nexustar August 2, 2025 09:26
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 2, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign xhebox for approval. For more information see the Code Review Process.
Please ensure that each of them provides their approval before proceeding.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 2, 2025
@dveeden
Copy link
Contributor Author

dveeden commented Aug 2, 2025

/cc @xhebox @breezewish @srstack

@ti-chi-bot ti-chi-bot bot requested review from breezewish, srstack and xhebox August 2, 2025 09:26
@dveeden dveeden changed the title Replace github.com/alecthomas/assert with github.com/stretchr/testify… Replace alecthomas/assert with testify/require Aug 2, 2025
@ti-chi-bot ti-chi-bot bot added the lgtm label Aug 3, 2025
@ti-chi-bot ti-chi-bot bot removed the lgtm label Aug 3, 2025
@codecov-commenter
Copy link

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 42.12%. Comparing base (f57cbe3) to head (a55f8f1).

⚠️ Current head a55f8f1 differs from pull request most recent head 258fc35

Please upload reports for the commit 258fc35 to get more accurate results.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2570      +/-   ##
==========================================
+ Coverage   40.92%   42.12%   +1.20%     
==========================================
  Files         364      335      -29     
  Lines       37715    36324    -1391     
==========================================
- Hits        15434    15299     -135     
+ Misses      20365    19111    -1254     
+ Partials     1916     1914       -2     
Flag Coverage Δ
playground 16.10% <ø> (+0.17%) ⬆️
unittest ?

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@ti-chi-bot ti-chi-bot bot added the lgtm label Aug 4, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 4, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-08-03 08:33:14.465386213 +0000 UTC m=+170704.608147378: ☑️ agreed by breezewish.
  • 2025-08-03 08:36:06.530509563 +0000 UTC m=+170876.673270738: ✖️🔁 reset by dveeden.
  • 2025-08-04 06:19:22.469334217 +0000 UTC m=+249072.612095382: ☑️ agreed by breezewish.

@xhebox xhebox merged commit e446891 into pingcap:master Aug 20, 2025
20 of 21 checks passed
xhebox added a commit that referenced this pull request Oct 22, 2025
* pkg/set: convert check to require (#2557)

* meta: replace pingcap/check with testing (#2559)

* embed: replace pingcap/check with testing (#2555)

* base52: replace pingcap/check with testing (#2556)

* localdata: replace pingcap/check with testing (#2561)

* utils: replace pingcap/check with testing (#2562)

* telemetry: remove (#2564)

* Telemetry removal

* Remove left over teleCommand

* repo: exclude prerelease version from version list if possible (#2550)

Signed-off-by: xhe <xw897002528@gmail.com>

* repo: abstract v1repoapi as interface (#2542)

* env: clean up old code

Signed-off-by: xhe <xw897002528@gmail.com>

* repo: leverage all apis into v1_repository

Signed-off-by: xhe <xw897002528@gmail.com>

* repo: abstract it as an interface

Signed-off-by: xhe <xw897002528@gmail.com>

* clean the remained part

Signed-off-by: xhe <xw897002528@gmail.com>

* rename to LocalComponentInstalled

Signed-off-by: xhe <xw897002528@gmail.com>

* update

Signed-off-by: xhe <xw897002528@gmail.com>

* try fix

Signed-off-by: xhe <xw897002528@gmail.com>

* g

Signed-off-by: xhe <xw897002528@gmail.com>

* try fix

Signed-off-by: xhe <xw897002528@gmail.com>

* g

Signed-off-by: xhe <xw897002528@gmail.com>

* g

Signed-off-by: xhe <xw897002528@gmail.com>

* g

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>

* cluster: also check exporter ports (#2563)

Signed-off-by: xhe <xw897002528@gmail.com>

* cluster: improve SELinux compatibility (#2501)

* cluster: improve SELinux compatibility

* fixup

* cluster: update --ssh desc (#2380)

* Update --ssh desc

* Update components/cluster/command/root.go

---------

Co-authored-by: xhe <xw897002528@gmail.com>

* cluster: add stop/start timeout for systemd service (#2568)

Signed-off-by: xhe <xw897002528@gmail.com>

* *: move insight to tiup (#2553)

* Move insight to tiup

* Fix linting issues

* Fix unused/gocritic/staticcheck issues

* *: check_to_require for cluster (#2566)

* check_to_require: cluster

* Restore TestCountDirMultiPath

---------

Co-authored-by: xhe <xw897002528@gmail.com>

* *: update dmpb (#2569)

* Update dmpb

* Remove dm grpc gw

* *: replace otiai10/copy with os.CopyFS (#2571)

* ci: add staging mirror option to release workflow (#2576)

* ci: fix STAGING version competition (#2579)

* playground: fix config typo (#2578)

Signed-off-by: Ryan Leung <rleungx@gmail.com>

* ci: add ci for feature branch (#2577)

Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com>

* ci: fix staging version string (#2582)

* ci: fix STAGING version competition

* ci: replace slashes with dots in branch name for STAGING_VER

* Apply suggestion from @wuhuizuo

* playground: fix tiflash metric (#2587)

Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com>

* *: Replace github.com/alecthomas/assert with github.com/stretchr/testify/require (#2570)

* Switch from yaml.v2 to yaml.v3 (#2558)

* Switch from yaml.v2 to yaml.v3

* Use KnownFields

* Use KnowFields for a few more places that previously had UnmarshalStrict

* Fix issues found by make check

* Formatting differences in yaml

* update

* fix CI

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>
Co-authored-by: xhe <xw897002528@gmail.com>

* cluster: support new ready api for PD (#2592)

* cluster: support new ready api for PD

Signed-off-by: xhe <xw897002528@gmail.com>

* try fix

Signed-off-by: xhe <xw897002528@gmail.com>

* try fix

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>

* cluster: clear leader_priority for pd leader if exist (#2591)

* cluster: clear leader_priority for pd leader if exist

Signed-off-by: xhe <xw897002528@gmail.com>

* fix

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>

* cluster: prompt for instance restart (#2513)

* cluster: prompt for instance restart

* Add comment

* fixup

* fixup

* Split precheck from Upgrade

* bump version to 1.16.3 (#2593)

Signed-off-by: xhe <xw897002528@gmail.com>

* *: Modernize (#2574)

* cluster: prevent panic when the operation is not upgrade (#2598)

Signed-off-by: xhe <xw897002528@gmail.com>

* *: fix unclosed mirror (#2607)

* *: fix unclosed mirror

Signed-off-by: xhe <xw897002528@gmail.com>

* fix

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>

* fix

* cdc wait tikv

---------

Signed-off-by: xhe <xw897002528@gmail.com>
Signed-off-by: Ryan Leung <rleungx@gmail.com>
Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com>
Co-authored-by: Daniël van Eeden <git@myname.nl>
Co-authored-by: xhe <xw897002528@gmail.com>
Co-authored-by: glkappe <qihang.li@pingcap.com>
Co-authored-by: wuhuizuo <wuhuizuo@126.com>
Co-authored-by: Ryan Leung <rleungx@gmail.com>
xhebox added a commit that referenced this pull request Nov 24, 2025
* pkg/set: convert check to require (#2557)

* meta: replace pingcap/check with testing (#2559)

* embed: replace pingcap/check with testing (#2555)

* base52: replace pingcap/check with testing (#2556)

* localdata: replace pingcap/check with testing (#2561)

* utils: replace pingcap/check with testing (#2562)

* telemetry: remove (#2564)

* Telemetry removal

* Remove left over teleCommand

* repo: exclude prerelease version from version list if possible (#2550)

Signed-off-by: xhe <xw897002528@gmail.com>

* repo: abstract v1repoapi as interface (#2542)

* env: clean up old code

Signed-off-by: xhe <xw897002528@gmail.com>

* repo: leverage all apis into v1_repository

Signed-off-by: xhe <xw897002528@gmail.com>

* repo: abstract it as an interface

Signed-off-by: xhe <xw897002528@gmail.com>

* clean the remained part

Signed-off-by: xhe <xw897002528@gmail.com>

* rename to LocalComponentInstalled

Signed-off-by: xhe <xw897002528@gmail.com>

* update

Signed-off-by: xhe <xw897002528@gmail.com>

* try fix

Signed-off-by: xhe <xw897002528@gmail.com>

* g

Signed-off-by: xhe <xw897002528@gmail.com>

* try fix

Signed-off-by: xhe <xw897002528@gmail.com>

* g

Signed-off-by: xhe <xw897002528@gmail.com>

* g

Signed-off-by: xhe <xw897002528@gmail.com>

* g

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>

* cluster: also check exporter ports (#2563)

Signed-off-by: xhe <xw897002528@gmail.com>

* cluster: improve SELinux compatibility (#2501)

* cluster: improve SELinux compatibility

* fixup

* cluster: update --ssh desc (#2380)

* Update --ssh desc

* Update components/cluster/command/root.go

---------

Co-authored-by: xhe <xw897002528@gmail.com>

* cluster: add stop/start timeout for systemd service (#2568)

Signed-off-by: xhe <xw897002528@gmail.com>

* *: move insight to tiup (#2553)

* Move insight to tiup

* Fix linting issues

* Fix unused/gocritic/staticcheck issues

* *: check_to_require for cluster (#2566)

* check_to_require: cluster

* Restore TestCountDirMultiPath

---------

Co-authored-by: xhe <xw897002528@gmail.com>

* *: update dmpb (#2569)

* Update dmpb

* Remove dm grpc gw

* *: replace otiai10/copy with os.CopyFS (#2571)

* ci: add staging mirror option to release workflow (#2576)

* ci: fix STAGING version competition (#2579)

* playground: fix config typo (#2578)

Signed-off-by: Ryan Leung <rleungx@gmail.com>

* ci: add ci for feature branch (#2577)

Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com>

* ci: fix staging version string (#2582)

* ci: fix STAGING version competition

* ci: replace slashes with dots in branch name for STAGING_VER

* Apply suggestion from @wuhuizuo

* playground: fix tiflash metric (#2587)

Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com>

* *: Replace github.com/alecthomas/assert with github.com/stretchr/testify/require (#2570)

* Switch from yaml.v2 to yaml.v3 (#2558)

* Switch from yaml.v2 to yaml.v3

* Use KnownFields

* Use KnowFields for a few more places that previously had UnmarshalStrict

* Fix issues found by make check

* Formatting differences in yaml

* update

* fix CI

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>
Co-authored-by: xhe <xw897002528@gmail.com>

* cluster: support new ready api for PD (#2592)

* cluster: support new ready api for PD

Signed-off-by: xhe <xw897002528@gmail.com>

* try fix

Signed-off-by: xhe <xw897002528@gmail.com>

* try fix

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>

* cluster: clear leader_priority for pd leader if exist (#2591)

* cluster: clear leader_priority for pd leader if exist

Signed-off-by: xhe <xw897002528@gmail.com>

* fix

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>

* cluster: prompt for instance restart (#2513)

* cluster: prompt for instance restart

* Add comment

* fixup

* fixup

* Split precheck from Upgrade

* bump version to 1.16.3 (#2593)

Signed-off-by: xhe <xw897002528@gmail.com>

* *: Modernize (#2574)

* cluster: prevent panic when the operation is not upgrade (#2598)

Signed-off-by: xhe <xw897002528@gmail.com>

* *: fix unclosed mirror (#2607)

* *: fix unclosed mirror

Signed-off-by: xhe <xw897002528@gmail.com>

* fix

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>

* playground: prepare code for nextgen support (#2608)

* playground: prepare code for nextgen support

Signed-off-by: xhe <xw897002528@gmail.com>

* fix tikv

Signed-off-by: xhe <xw897002528@gmail.com>

* fix CI

Signed-off-by: xhe <xw897002528@gmail.com>

* fix CI

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>

* playground: add support for nextgen (#2619)

* playground: add support for nextgen

Signed-off-by: xhe <xw897002528@gmail.com>

* s

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>

* playground: hack around nextgen version resolve (#2621)

Signed-off-by: xhe <xw897002528@gmail.com>

* playground: fix monitor version for nextgen (#2622)

Signed-off-by: xhe <xw897002528@gmail.com>

* Remove ansible import functionality (#2565)

* Remove ansible import functionality

* update go.sum

* playground: rename tidb-nextgen to tidb-x (#2623)

* playground: rename tidb-nextgen to tidb-x

Signed-off-by: xhe <xw897002528@gmail.com>

* fix lint

Signed-off-by: xhe <xw897002528@gmail.com>

* fix lint

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>

* repository: delete temporary dir for downloading (#2626)

Signed-off-by: xhe <xw897002528@gmail.com>

* utils: Make UserHome() respect the HOME env variable (#2624)

* Fix minor typos (#2601)

* bump to v1.16.4 (#2627)

Signed-off-by: xhe <xw897002528@gmail.com>

* *: do not trigger release for release-x branch (#2629)

* playground,cluster: respect HOME env variable (#2628)

* playground,cluster: respect HOME env variable

* fix import

* Update golang.org/x/net (#2631)

* tiup: fix recording of execution history (#2635)

* Fix recording of execution history

* Improve filtering of sensitive info and add tests

* Add test for dumpling style password

* hide sensitive dmctl info from execution history

* Add redaction of sensitive info in URLs

* Fix function name

* Add test to increase coverage

* Also strip access-key from S3 URIs

* fix test

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>
Co-authored-by: xhe <xw897002528@gmail.com>

* *: use full env only when TIUP_CLUSTER_DEBUG is true (#2637)

* logger: use TIUP_CLUSTER_DEBUG to set zap level (default INFO)

* env printing: whitelist in non-debug; full env in DebugMode; centralize EnvList in environment; refactor callers

* docs: clarify EnvList reference to pkg/environment/env.go for env visibility control

* Switch to codecov-action (#2639)

* playground: refine nextgen version resolve (#2640)

* playground: refine nextgen version resolve

Signed-off-by: xhe <xw897002528@gmail.com>

* g

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>

* CI: update and fix integrate-dm (#2643)

* playground: fix metafile location (#2638)

* playground: fix metafile location

* g

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>
Co-authored-by: xhe <xw897002528@gmail.com>

* Upgrade usql (#2595)

* cluster: fix instance level timeout stop (#2644)

Signed-off-by: xhe <xw897002528@gmail.com>

* playground: dont request mirror when binpath specified (#2645)

* playground: dont request mirror when binpath specified

Signed-off-by: xhe <xw897002528@gmail.com>

* add tikv worker

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>

* playgroud: support tiflash in nextgen (#2641)

* playground: refine nextgen version resolve

Signed-off-by: xhe <xw897002528@gmail.com>

* playgroud: support tiflash

Signed-off-by: xhe <xw897002528@gmail.com>

* fix version

Signed-off-by: xhe <xw897002528@gmail.com>

* fix

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>

* cluster: cleanup ansible import related things (#2630)

* cluster: cleanup ansible import related things

* revert back missing code

Signed-off-by: xhe <xw897002528@gmail.com>

* fix test

Signed-off-by: xhe <xw897002528@gmail.com>

* remove ansible test

Signed-off-by: xhe <xw897002528@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>
Co-authored-by: xhe <xw897002528@gmail.com>

* *: cleanup unit test generated data (#2647)

* *: add option to force redownload binaries (#2648)

Signed-off-by: xhe <xw897002528@gmail.com>

* playground: fix nextgen install (#2649)

* fix: merge master and fix build errors

* fix: resolve merge conflicts and fix build errors

* fix: resolve merge conflicts and fix build and linting errors

* fix

* fix

* fix

Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com>

* fix

Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com>

* fix

Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com>

* fix

Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com>

* fix

Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com>

* fix

Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com>

* fix

Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com>

---------

Signed-off-by: xhe <xw897002528@gmail.com>
Signed-off-by: Ryan Leung <rleungx@gmail.com>
Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com>
Co-authored-by: Daniël van Eeden <git@myname.nl>
Co-authored-by: xhe <xw897002528@gmail.com>
Co-authored-by: glkappe <qihang.li@pingcap.com>
Co-authored-by: wuhuizuo <wuhuizuo@126.com>
Co-authored-by: Ryan Leung <rleungx@gmail.com>
Co-authored-by: Otto Kekäläinen <otto@kekalainen.net>
Co-authored-by: Michael Zhang <90968483+mzhang77@users.noreply.github.com>
Co-authored-by: Allen Zhong <pdev@zhoal.pw>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants