reduce flakiness of TestSwarmLockUnlockCluster and TestSwarmJoinPromoteLocked#38546
Merged
AkihiroSuda merged 1 commit intomoby:masterfrom Jan 15, 2019
Merged
reduce flakiness of TestSwarmLockUnlockCluster and TestSwarmJoinPromoteLocked#38546AkihiroSuda merged 1 commit intomoby:masterfrom
AkihiroSuda merged 1 commit intomoby:masterfrom
Conversation
thaJeztah
commented
Jan 12, 2019
Member
Author
There was a problem hiding this comment.
Added a temporary commit to trigger our new "flaky check" 🎉 @olljanat 🤞
Contributor
There was a problem hiding this comment.
@thaJeztah integration-cli/ is deprecated so flaky check is only looking for new tests under integration/ folder...
How ever you can easily test that old test on locally by running commands:
export TEST_REPEAT="5"
export TIMEOUT="30m"
export TESTFLAGS="-test.count 5 -check.f TestSwarmJoinPromoteLocked"
make test-integration
Member
Author
There was a problem hiding this comment.
LOL, yes, just thought of that hahaha
19:15:21 The following new tests were added to integration-cli:
19:15:21 +func (s *DockerSwarmSuite) TestUnlockEngineAndUnlockedSwarm_FLAKY(c *check.C) {
19:15:21 +func (s *DockerSwarmSuite) TestSwarmJoinPromoteLocked_FLAKY(c *check.C) {
19:15:21
19:15:21 integration-cli is deprecated. Please add an API integration test to
19:15:21 ./integration/COMPONENT/. See ./TESTING.md for more details.
Contributor
There was a problem hiding this comment.
But you can of course also set those to
moby/hack/make/.integration-test-helpers
Lines 14 to 15 in 37498f0
thaJeztah
force-pushed
the
wait_a_second
branch
from
6509775 to
31f5338
Compare
thaJeztah
force-pushed
the
wait_a_second
branch
from
31f5338 to
35c426a
Compare
thaJeztah
changed the title
…teLocked
I noticed that this test failed, because the node was in status "pending".
The test checks for the node's status immediately after it was restarted, so
possibly it needs some time to unlock.
14:07:10 FAIL: docker_cli_swarm_test.go:1128: DockerSwarmSuite.TestSwarmLockUnlockCluster
...
14:07:10 docker_cli_swarm_test.go:1168:
14:07:10 checkSwarmLockedToUnlocked(c, d)
14:07:10 docker_cli_swarm_test.go:1017:
14:07:10 c.Assert(getNodeStatus(c, d), checker.Equals, swarm.LocalNodeStateActive)
14:07:10 ... obtained swarm.LocalNodeState = "pending"
14:07:10 ... expected swarm.LocalNodeState = "active"
This patch adds a `waitAndAssert` for the node's status, with a 1 second timeout.
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Member
Author
|
So far so good; I'll only have to push once more (as I made a copy/pasta error in my commit message 😂) |
thaJeztah
force-pushed
the
wait_a_second
branch
from
35c426a to
973ca00
Compare
Codecov Report
@@ Coverage Diff @@
## master #38546 +/- ##
==========================================
+ Coverage 36.62% 36.65% +0.02%
==========================================
Files 608 608
Lines 45173 45173
==========================================
+ Hits 16545 16558 +13
+ Misses 26341 26333 -8
+ Partials 2287 2282 -5 |
tiborvass
approved these changes
Jan 14, 2019
seemethere
approved these changes
Jan 15, 2019
AkihiroSuda
approved these changes
Jan 15, 2019
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
I noticed that this test failed, because the node was in status "pending".
The test checks for the node's status immediately after it was restarted, so
possibly it needs some time to unlock.
This patch adds a
waitAndAssertfor the node's status, with a 1 second timeout.relates to #34051 and #35263