From af0f7ad7922a6ac8a3369d3e80212072fffd2d86 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Tue, 26 Jul 2016 11:40:15 -0700 Subject: [PATCH] Fix flaky TestSwarmNodeTaskListFilter by waiting for task fully deployed 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 (cherry picked from commit 63c0366bc9a7f326ad61cdfa69fa860cf844a2c7) Signed-off-by: Tibor Vass --- integration-cli/docker_cli_swarm_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go index 4acdf3fcb0..f454baee7c 100644 --- a/integration-cli/docker_cli_swarm_test.go +++ b/integration-cli/docker_cli_swarm_test.go @@ -177,6 +177,9 @@ func (s *DockerSwarmSuite) TestSwarmNodeTaskListFilter(c *check.C) { c.Assert(err, checker.IsNil) 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" out, err = d.Cmd("node", "ps", "--filter", filter, "self")