Forráskód Böngészése

Fix flakey TestStatsAllNewContainersAdded

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Brian Goff 9 éve
szülő
commit
efd281d6eb
1 módosított fájl, 4 hozzáadás és 3 törlés
  1. 4 3
      integration-cli/docker_cli_stats_test.go

+ 4 - 3
integration-cli/docker_cli_stats_test.go

@@ -102,7 +102,7 @@ func (s *DockerSuite) TestStatsAllNewContainersAdded(c *check.C) {
 	id := make(chan string)
 	addedChan := make(chan struct{})
 
-	dockerCmd(c, "run", "-d", "busybox", "top")
+	runSleepingContainer(c, "-d")
 	statsCmd := exec.Command(dockerBinary, "stats")
 	stdout, err := statsCmd.StdoutPipe()
 	c.Assert(err, check.IsNil)
@@ -118,16 +118,17 @@ func (s *DockerSuite) TestStatsAllNewContainersAdded(c *check.C) {
 			switch {
 			case matchID.MatchString(scanner.Text()):
 				close(addedChan)
+				return
 			}
 		}
 	}()
 
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
+	out, _ := runSleepingContainer(c, "-d")
 	c.Assert(waitRun(strings.TrimSpace(out)), check.IsNil)
 	id <- strings.TrimSpace(out)[:12]
 
 	select {
-	case <-time.After(10 * time.Second):
+	case <-time.After(30 * time.Second):
 		c.Fatal("failed to observe new container created added to stats")
 	case <-addedChan:
 		// ignore, done