[integration-test] add delay to some test case

Author: Jimmy-Xu

integration-cli/hyper_cli_logs_test.go

@@ -69,9 +69,11 @@ func (s *DockerSuite) TestCliLogsTimestamps(c *check.C) {
 	testLen := 100
 	pullImageIfNotExist("busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo =; done;", testLen))
+	time.Sleep(5 * time.Second)
 
 	id := strings.TrimSpace(out)
 	dockerCmd(c, "stop", id)
+	time.Sleep(5 * time.Second)
 
 	out, _ = dockerCmd(c, "logs", "-t", id)
 
@@ -99,9 +101,11 @@ func (s *DockerSuite) TestCliLogsSeparateStderr(c *check.C) {
 	pullImageIfNotExist("busybox")
 	msg := "stderr_log"
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("echo %s 1>&2", msg))
+	time.Sleep(5 * time.Second)
 
 	id := strings.TrimSpace(out)
 	dockerCmd(c, "stop", id)
+	time.Sleep(5 * time.Second)
 
 	stdout, stderr, _ := dockerCmdWithStdoutStderr(c, "logs", id)
 
@@ -120,9 +124,11 @@ func (s *DockerSuite) TestCliLogsStderrInStdout(c *check.C) {
 	pullImageIfNotExist("busybox")
 	msg := "stderr_log"
 	out, _ := dockerCmd(c, "run", "-d", "-t", "busybox", "sh", "-c", fmt.Sprintf("echo %s 1>&2", msg))
+	time.Sleep(5 * time.Second)
 
 	id := strings.TrimSpace(out)
 	dockerCmd(c, "stop", id)
+	time.Sleep(5 * time.Second)
 
 	stdout, stderr, _ := dockerCmdWithStdoutStderr(c, "logs", id)
 	c.Assert(stderr, checker.Equals, "")
@@ -139,9 +145,11 @@ func (s *DockerSuite) TestCliLogsTail(c *check.C) {
 	testLen := 100
 	pullImageIfNotExist("busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo =; done;", testLen))
+	time.Sleep(5 * time.Second)
 
 	id := strings.TrimSpace(out)
 	dockerCmd(c, "stop", id)
+	time.Sleep(5 * time.Second)
 
 	out, _ = dockerCmd(c, "logs", "--tail", "5", id)
 
@@ -169,9 +177,11 @@ func (s *DockerSuite) TestCliLogsFollowStopped(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 	pullImageIfNotExist("busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "echo", "hello")
+	time.Sleep(5 * time.Second)
 
 	id := strings.TrimSpace(out)
 	dockerCmd(c, "stop", id)
+	time.Sleep(5 * time.Second)
 
 	logsCmd := exec.Command(dockerBinary, "logs", "-f", id)
 	c.Assert(logsCmd.Start(), checker.IsNil)
@@ -199,6 +209,7 @@ func (s *DockerSuite) TestCliLogsSince(c *check.C) {
 	name := "testlogssince"
 	dockerCmd(c, "run", "--name="+name, "-d", "busybox", "/bin/sh", "-c", "for i in $(seq 1 30); do sleep 2; echo log$i; done")
 	time.Sleep(5*time.Second)
+
 	out, _ := dockerCmd(c, "logs", "-t", name)
 
 	log2Line := strings.Split(strings.Split(out, "\n")[1], " ")
@@ -238,6 +249,7 @@ func (s *DockerSuite) TestCliLogsSinceFutureFollow(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 	pullImageIfNotExist("busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", `for i in $(seq 1 50); do date +%s; sleep 1; done`)
+	time.Sleep(5 * time.Second)
 	id := strings.TrimSpace(out)
 
 	now := daemonTime(c).Unix()
@@ -260,13 +272,14 @@ func (s *DockerSuite) TestCliLogsFollowSlowStdoutConsumer(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 	pullImageIfNotExist("busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", `usleep 600000;yes X | head -c 200000`)
-
+	time.Sleep(5 * time.Second)
 	id := strings.TrimSpace(out)
 
 	stopSlowRead := make(chan bool)
 
 	go func() {
 		exec.Command(dockerBinary, "stop", id).Run()
+		time.Sleep(5 * time.Second)
 		stopSlowRead <- true
 	}()
 

integration-cli/hyper_cli_restart_test.go

@@ -16,14 +16,15 @@ func (s *DockerSuite) TestCliRestartStoppedContainer(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 	pullImageIfNotExist("busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "echo", "foobar")
-
+	time.Sleep(5 * time.Second)
 	cleanedContainerID := strings.TrimSpace(out)
 	c.Assert(waitExited(cleanedContainerID, 30*time.Second), checker.IsNil)
 
 	out, _ = dockerCmd(c, "logs", cleanedContainerID)
 	c.Assert(out, checker.Equals, "foobar\n")
 
 	dockerCmd(c, "restart", cleanedContainerID)
+	time.Sleep(5 * time.Second)
 
 	out, _ = dockerCmd(c, "logs", cleanedContainerID)
 	c.Assert(out, checker.Equals, "foobar\n")
@@ -35,7 +36,7 @@ func (s *DockerSuite) TestCliRestartRunningContainer(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 	pullImageIfNotExist("busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", "echo foobar && sleep 30 && echo 'should not print this'")
-
+	time.Sleep(5 * time.Second)
 	cleanedContainerID := strings.TrimSpace(out)
 
 	c.Assert(waitRun(cleanedContainerID), checker.IsNil)
@@ -44,6 +45,7 @@ func (s *DockerSuite) TestCliRestartRunningContainer(c *check.C) {
 	c.Assert(out, checker.Equals, "foobar\n")
 
 	dockerCmd(c, "restart", "-t", "1", cleanedContainerID)
+	time.Sleep(5 * time.Second)
 
 	out, _ = dockerCmd(c, "logs", cleanedContainerID)
 

integration-cli/hyper_cli_run_test.go

@@ -127,11 +127,14 @@ func (s *DockerSuite) TestCliRunDetachedContainerIDPrinting(c *check.C) {
 	defer printTestDuration(time.Now())
 	pullImageIfNotExist("busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
+	time.Sleep(5 * time.Second)
 
 	out = strings.TrimSpace(out)
 	dockerCmd(c, "stop", out)
+	time.Sleep(5 * time.Second)
 
 	rmOut, _ := dockerCmd(c, "rm", out)
+	time.Sleep(5 * time.Second)
 
 	rmOut = strings.TrimSpace(rmOut)
 	if rmOut != out {
@@ -995,6 +998,7 @@ func (s *DockerSuite) TestCliRunUnknownCommand(c *check.C) {
 
 	cID := strings.TrimSpace(out)
 	_, _, err := dockerCmdWithError("start", cID)
+	time.Sleep(5 * time.Second)
 
 	// Windows and Linux are different here by architectural design. Linux will
 	// fail to start the container, so an error is expected. Windows will
@@ -1107,7 +1111,7 @@ func (s *DockerSuite) TestCliRunRestartMaxRetries(c *check.C) {
 	defer printTestDuration(time.Now())
 	pullImageIfNotExist("busybox")
 	out, _ := dockerCmd(c, "run", "-d", "--restart=on-failure:3", "busybox", "sh", "-c", "sleep 15; false")
-	timeout := 60 * time.Second
+	timeout := 90 * time.Second
 	if daemonPlatform == "windows" {
 		timeout = 45 * time.Second
 	}