roachtest: fix acceptance/decommission #51071
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This change is |
nvanbenschoten
approved these changes
Jul 7, 2020
pkg/cmd/roachtest/decommission.go
Outdated
| @@ -710,6 +710,12 @@ WHERE "eventType" IN ($1, $2) ORDER BY timestamp`, | |||
| {"node_decommissioned", "1"}, | |||
| } | |||
|
|
|||
| if !selfFlagSupported { | |||
| // If `--self` is not supported then we don't expect to see | |||
| // node 1 self decommission and recommission (step 3 and 4) | |||
There was a problem hiding this comment.
nit: missing period at end of comment.
The added --self flag makes the test fail with 20.1 and 19.2 With 20.1 the flag is not supported and so the expected result should reflect that the step where a node decommissions self will not happen. With 19.2 the match that --self is not supported doesn't work as the error message capitalization differs. The fix changes the expected result and corrects the match of --self not supported to work with 19.2 as well Release note: None
darinpp
force-pushed
the
fix_decommission_acceptance
branch
from
9438e07 to
fc417bd
Compare
|
bors r+ |
Build failed (retrying...) |
|
bors r+ |
|
Already running a review |
Build succeeded |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The added --self flag makes the test fail with 20.1 and 19.2
With 20.1 the flag is not supported and so the expected
result should reflect that the step where a node decommissions self
will not happen.
With 19.2 the match that --self is not supported doesn't work
as the error message capitalization differs.
The fix changes the expected result and corrects the match of --self not
supported to work with 19.2 as well
Release note: None