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

ddl: improve test to avoid cycle import #32058

Merged
merged 16 commits into from
Mar 14, 2022
Merged

ddl: improve test to avoid cycle import #32058

merged 16 commits into from
Mar 14, 2022

Conversation

hawkingrei
Copy link
Member

@hawkingrei hawkingrei commented Jan 28, 2022 •
edited
Loading

Signed-off-by: Weizhen Wang [email protected]

What problem does this PR solve?

Issue Number: ref #31716

Problem Summary:

What is changed and how it works?

Check List

Tests

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

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jan 28, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • rebelice
  • wjhuang2016

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 Jan 28, 2022
@hawkingrei
Copy link
Member Author

/run-unit-test

@hawkingrei hawkingrei added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 29, 2022
@ti-chi-bot ti-chi-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 29, 2022
@hawkingrei hawkingrei force-pushed the ddl_test_improve_234 branch from aa1e5eb to a1a5e91 Compare January 30, 2022 16:06
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 30, 2022
@hawkingrei hawkingrei removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 30, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jan 30, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/95db553c7fe51fc120151b8a19af69828c43010f

@hawkingrei hawkingrei mentioned this pull request Feb 2, 2022
Merged
@hawkingrei hawkingrei changed the title ddl: improve test ddl: improve test to avoid cycle import Feb 3, 2022
@hawkingrei hawkingrei force-pushed the ddl_test_improve_234 branch from 6b1ee83 to 26becb4 Compare February 7, 2022 16:40
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 14, 2022
@hawkingrei hawkingrei force-pushed the ddl_test_improve_234 branch from 8a254c8 to de23f2b Compare March 2, 2022 09:40
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 2, 2022
@hawkingrei hawkingrei force-pushed the ddl_test_improve_234 branch from 2754038 to 74d9222 Compare March 13, 2022 10:27
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 13, 2022
@hawkingrei
Copy link
Member Author

/run-unit-test

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 14, 2022
@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 Mar 14, 2022
@rebelice
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 927b14f

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

@hawkingrei: 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 ffaeb3e into pingcap:master Mar 14, 2022
@hawkingrei hawkingrei deleted the ddl_test_improve_234 branch March 14, 2022 04:22
tisonkun
tisonkun reviewed Mar 16, 2022
View reviewed changes
testkit/external/util.go
)

// GetTableByName gets table by name for test.
func GetTableByName(t *testing.T, tk *testkit.TestKit, db, table string) table.Table {
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you please describe how moving out these methods resolve cycle import?

IMO it's quite a bit clumsy now to write GetTableByName(t, tk, ...) instead of tk.GetTableByName(...).

Also, this PR is blank to describe the background and motivation to make a non-trivial change. It confuses.

Copy link
Member Author

Choose a reason for hiding this comment

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

We have a feature branch and add some test cases. but we find some import cycles when adding test cases for example domain, table, and so on. so we think we should add less dependency in the testkit pkg. and put more dependency into other package.

@tisonkun tisonkun mentioned this pull request Mar 23, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tisonkun tisonkun tisonkun left review comments

@rebelice rebelice rebelice approved these changes

@wjhuang2016 wjhuang2016 wjhuang2016 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.
6 participants
@hawkingrei @ti-chi-bot @sre-bot @rebelice @wjhuang2016 @tisonkun