Skip to content
This repository has been archived by the owner on Dec 8, 2021. It is now read-only.

tests: fix a test failure due to conflict between #145 and #158 #159

Merged
merged 2 commits into from
Apr 4, 2019

Conversation

kennytm
Copy link
Collaborator

@kennytm kennytm commented Apr 3, 2019

What problem does this PR solve?

Fix this failure https://internal.pingcap.net/idc-jenkins/blue/organizations/jenkins/test_lightning_master/detail/test_lightning_master/25/pipeline

Problem was that #158 introduced a new test involving a failpoint which definition is changed in #145. There is no syntactical conflict between the two so the PRs merged cleanly, but the semantic conflict caused the integration test failure above.

What is changed and how it works?

Updated the failpoint definition.

Check List

Tests

  • Integration test

Side effects

Related changes

@kennytm kennytm added status/PTAL This PR is ready for review. Add this label back after committing new changes priority/unimportant type/test Changes test cases only qa Quality assurance labels Apr 3, 2019
@kennytm
Copy link
Collaborator Author

kennytm commented Apr 3, 2019

/run-all-tests

@kennytm
Copy link
Collaborator Author

kennytm commented Apr 3, 2019

PTAL @amyangfei @lonng

@kennytm
Copy link
Collaborator Author

kennytm commented Apr 3, 2019

/run-all-tests

@lonng
Copy link
Contributor

lonng commented Apr 4, 2019

LGTM

@lonng lonng added status/LGT1 One reviewer already commented LGTM (LGTM1) and removed status/PTAL This PR is ready for review. Add this label back after committing new changes labels Apr 4, 2019
Copy link
Contributor

@amyangfei amyangfei left a comment

Choose a reason for hiding this comment

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

LGTM

@amyangfei amyangfei added status/LGT2 Two reviewers already commented LGTM, ready for merge (LGTM2) and removed status/LGT1 One reviewer already commented LGTM (LGTM1) labels Apr 4, 2019
@kennytm kennytm merged commit 43fdfc3 into master Apr 4, 2019
@kennytm kennytm deleted the kennytm/fix-158-145-conflict branch April 4, 2019 03:02
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
qa Quality assurance status/LGT2 Two reviewers already commented LGTM, ready for merge (LGTM2) type/test Changes test cases only
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants