Преглед изворни кода

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 <anshul.pundir@docker.com>
Anshul Pundir пре 7 година
родитељ
комит
c5c779adc8
1 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 2
      integration-cli/docker_cli_swarm_test.go

+ 2 - 2
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)
 	waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 1)
 
 
 	// We need to get the container id.
 	// 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)
 	c.Assert(err, checker.IsNil)
 	id := strings.TrimSpace(out)
 	id := strings.TrimSpace(out)
 
 
@@ -872,7 +872,7 @@ func (s *DockerSwarmSuite) TestSwarmServiceTTY(c *check.C) {
 	waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 1)
 	waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 1)
 
 
 	// We need to get the container id.
 	// 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)
 	c.Assert(err, checker.IsNil)
 	id = strings.TrimSpace(out)
 	id = strings.TrimSpace(out)