Skip to content
This repository was archived by the owner on Nov 24, 2023. It is now read-only.

test: fix unstable CI caused by concurrent unit test (#1541)#1545

Merged
ti-chi-bot merged 1 commit into
pingcap:release-2.0from
ti-srebot:release-2.0-7c7f66069b96
Mar 30, 2021
Merged

test: fix unstable CI caused by concurrent unit test (#1541)#1545
ti-chi-bot merged 1 commit into
pingcap:release-2.0from
ti-srebot:release-2.0-7c7f66069b96

Conversation

@ti-srebot
Copy link
Copy Markdown

@ti-srebot ti-srebot commented Mar 29, 2021

cherry-pick #1541 to release-2.0
You can switch your code base to this Pull Request by using git-extras:

# In dm repo:
git pr https://github.com/pingcap/dm/pull/1545

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/dm.git pr/1545:release-2.0-7c7f66069b96

What problem does this PR solve?

in #1539 https://internal.pingcap.net/idc-jenkins/blue/organizations/jenkins/dm_ghpr_test/detail/dm_ghpr_test/8606/pipeline , one unit test is disturbed by other

[2021-03-29T03:59:27.882Z] FAIL: optimist_test.go:148: testOptimist.TestOptimist
[2021-03-29T03:59:27.882Z] 
[2021-03-29T03:59:27.882Z] optimist_test.go:149:
[2021-03-29T03:59:27.882Z]     t.testOptimist(c, noRestart)
[2021-03-29T03:59:27.882Z] optimist_test.go:351:
[2021-03-29T03:59:27.882Z]     c.Assert(opm, HasLen, 0)
[2021-03-29T03:59:27.882Z] ... obtained map[string]map[string]map[string]map[string]optimism.Operation = map[string]map[string]map[string]map[string]optimism.Operation{"task":map[string]map[string]map[string]optimism.Operation{"mysql-replica-1":map[string]map[string]optimism.Operation{"foo":map[string]optimism.Operation{"bar-1":optimism.Operation{ID:"task-`db`.`tbl`", Task:"task", Source:"mysql-replica-1", UpSchema:"foo", UpTable:"bar-1", DDLs:[]string{"ALTER TABLE bar ADD COLUMN c1 INT"}, ConflictStage:"none", Done:false}}}}}
[2021-03-29T03:59:27.882Z] ... n int = 0

What is changed and how it works?

seems we should use SerialSuites

Check List

Tests

  • No code

Code changes

Side effects

Related changes

  • Need to cherry-pick to the release branch

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@lance6716
Copy link
Copy Markdown
Collaborator

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 One reviewer already commented LGTM label Mar 30, 2021
Copy link
Copy Markdown
Collaborator

@GMHDBJD GMHDBJD left a comment

Choose a reason for hiding this comment

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

/lgtm

@ti-chi-bot
Copy link
Copy Markdown
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • GMHDBJD
  • lance6716

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.

Details

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/LGT1 One reviewer already commented LGTM labels Mar 30, 2021
@lance6716
Copy link
Copy Markdown
Collaborator

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

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

DetailsCommit hash: 18aab7f

@ti-chi-bot ti-chi-bot merged commit 10daa02 into pingcap:release-2.0 Mar 30, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

first-time-contributor size/XS status/can-merge status/LGT2 Two reviewers already commented LGTM, ready for merge type/cherry-pick This PR is just a cherry-pick (backport)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants