From c5c779adc8c207cfb77a9115450f3e4f1783b26e Mon Sep 17 00:00:00 2001 From: Anshul Pundir Date: Tue, 5 Dec 2017 14:30:16 -0800 Subject: [PATCH] Change TestSwarmServiceTTY to only verify running containers since with swarmkit#b187b24 service deletions/scale-downs don't directly remove the container. Signed-off-by: Anshul Pundir --- integration-cli/docker_cli_swarm_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go index 9488fff45e..283f576f57 100644 --- a/integration-cli/docker_cli_swarm_test.go +++ b/integration-cli/docker_cli_swarm_test.go @@ -849,7 +849,7 @@ func (s *DockerSwarmSuite) TestSwarmServiceTTY(c *check.C) { waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 1) // We need to get the container id. - out, err = d.Cmd("ps", "-a", "-q", "--no-trunc") + out, err = d.Cmd("ps", "-q", "--no-trunc") c.Assert(err, checker.IsNil) id := strings.TrimSpace(out) @@ -872,7 +872,7 @@ func (s *DockerSwarmSuite) TestSwarmServiceTTY(c *check.C) { waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 1) // We need to get the container id. - out, err = d.Cmd("ps", "-a", "-q", "--no-trunc") + out, err = d.Cmd("ps", "-q", "--no-trunc") c.Assert(err, checker.IsNil) id = strings.TrimSpace(out)