Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

server: migrate test-infra to testify for server/statistics_handler_test.go #28029

Merged
merged 7 commits into from
Sep 16, 2021
Merged

server: migrate test-infra to testify for server/statistics_handler_test.go #28029

merged 7 commits into from
Sep 16, 2021

Conversation

yedamao
Copy link
Contributor

@yedamao yedamao commented Sep 14, 2021

What problem does this PR solve?

Issue Number: close #27807

Release note 

None.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 14, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • tisonkun
  • xhebox

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 14, 2021
xhebox
xhebox approved these changes Sep 15, 2021
View reviewed changes
server/server_test.go Outdated
@@ -221,6 +222,49 @@ func (dbt *DBTest) mustQueryRows(query string, args ...interface{}) {
rows.Close()
}

// DBTestWithT like DBTest, but replace *check.C to *testing.T
// TODO remove/rename when migrate server_test.go and statistics_handler_test.go to testify done
type DBTestWithT struct {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it can be abstract to the testkit package. Also, I remembered that there are https://github.com/jmoiron/sqlx.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 15, 2021
@tisonkun
Copy link
Contributor

Thanks for your contribution @yedamao !

I don't think we should keep all structure previous test has. It is just one test case so we can write the code fall through directly. I'll push a commit with the comment by @xhebox

@tisonkun
dbtestkit
684f529 
Signed-off-by: tison <wander4096@gmail.com>
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 16, 2021
tisonkun
tisonkun approved these changes Sep 16, 2021
View reviewed changes
Copy link
Contributor

@tisonkun tisonkun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xhebox please give this PR another pass. I make some non trivial changes based on your comment.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 16, 2021
xhebox
xhebox approved these changes Sep 16, 2021
View reviewed changes
server/statistics_handler_serial_test.go
resp2, err := client.fetchStatus("/stats/dump/tidb/test/" + snapshot)
require.NoError(t, err)
defer func() {
require.NoError(t, resp2.Body.Close())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The most important reason why there are terror.Call to be lazy. 🤣

@xhebox
Copy link
Contributor

xhebox commented Sep 16, 2021

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 684f529

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 16, 2021
@ti-chi-bot
Copy link
Member

@yedamao: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot merged commit c891bf3 into pingcap:master Sep 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xhebox xhebox xhebox approved these changes

@tisonkun tisonkun tisonkun approved these changes

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

migrate test-infra to testify for server/statistics_handler_test.go
4 participants
@yedamao @ti-chi-bot @tisonkun @xhebox