beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix flaky TestSwarmNodeTaskListFilter by waiting for task fully deployed

Browse source 
This is an attempt to fix the flaky test of TestSwarmNodeTaskListFilter in 25029.

Basically this fix adds a check to wait until 3 containers has already up,
before processing `node tasks ...`.

This might fix 25029.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 63c0366bc9)
Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Yong Tang 2016-07-26 11:40:15 -07:00 committed by Tibor Vass
parent 16a0c1c374
commit af0f7ad792
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
integration-cli/docker_cli_swarm_test.go
View file

@ -177,6 +177,9 @@ func (s *DockerSwarmSuite) TestSwarmNodeTaskListFilter(c *check.C) {
c.Assert(err, checker.IsNil) c.Assert(err, checker.IsNil)
c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "") c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
// make sure task has been deployed.
waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 3)
filter := "name=redis-cluster" filter := "name=redis-cluster"
out, err = d.Cmd("node", "ps", "--filter", filter, "self") out, err = d.Cmd("node", "ps", "--filter", filter, "self")