Update the TestSwarmLockUnlockCluster test to be less flakey.
#28997
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
cyli
commented
Nov 30, 2016
| @@ -1079,10 +1079,9 @@ func (s *DockerSwarmSuite) TestSwarmLockUnlockCluster(c *check.C) { | |||
| c.Assert(getNodeStatus(c, d2), checker.Equals, swarm.LocalNodeStateActive) | |||
|
|
|||
| // once it's caught up, d2 is set to not be locked | |||
| c.Assert(d2.Restart(), checker.IsNil) | |||
There was a problem hiding this comment.
There was a problem hiding this comment.
I'm not sure this is necessary. The root cause looks like a bug in swarmkit. I'm going to submit a PR to fix it.
There was a problem hiding this comment.
@aaronlehmann The pending one? This one I think is where I'm not retrying after converting from autolocked to non-autolocked.
There was a problem hiding this comment.
@aaronlehmann Ok, will remove the waiting for the state to not be in pending, then.
cyli
commented
Nov 30, 2016
| func getNodeStatus(c *check.C, d *SwarmDaemon) swarm.LocalNodeState { | ||
| info, err := d.info() |
There was a problem hiding this comment.
tonistiigi
reviewed
Nov 30, 2016
| info swarm.Info | ||
| err error | ||
| ) | ||
| waitAndAssert(c, defaultReconciliationTimeout, func(*check.C) (interface{}, check.CommentInterface) { |
There was a problem hiding this comment.
there is already a method d.checkLocalNodeState for this
tophj-ibm
reviewed
Nov 30, 2016
| func getNodeStatus(c *check.C, d *SwarmDaemon) swarm.LocalNodeState { | ||
| waitAndAssert(c, defaultReconciliationTimeout, d.checkLocalNodeState, checker.NotEquals, swarm.LocalNodeStatePending) |
There was a problem hiding this comment.
checker.NotEquals is undefined, it should be checker.Not(checker.Equals)
Signed-off-by: cyli <[email protected]>
cyli
changed the title
TestSwarmLockUnlockCluster test to be less flakey.
|
LGTM |
1 similar comment
|
LGTM |
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.
This ensures that we wait until the state is not pending in order to check whether a swarm cluster is locked or unlocked, and ensure that we will optionally wait when transitioning from an autolocked state to a non-autolocked state and vice versa.
Would be useful for 1.13.
cc @tonistiigi @aaronlehmann