From 88c1bc10c4c2490789953e4d6065cab6e9b1585b Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Fri, 20 Nov 2015 23:12:12 +0100 Subject: [PATCH] Increase timeouts to fix test on ARM Signed-off-by: Stefan Scherer --- integration-cli/docker_cli_build_test.go | 4 ++-- integration-cli/docker_cli_events_test.go | 2 +- integration-cli/docker_cli_exec_unix_test.go | 2 +- integration-cli/docker_cli_start_test.go | 2 +- integration-cli/docker_utils.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index faeec5465d..5b2ae74888 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -759,7 +759,7 @@ ADD test_file .`, close(errChan) }() select { - case <-time.After(5 * time.Second): + case <-time.After(15 * time.Second): c.Fatal("Build with adding to workdir timed out") case err := <-errChan: c.Assert(err, check.IsNil) @@ -1408,7 +1408,7 @@ COPY test_file .`, close(errChan) }() select { - case <-time.After(5 * time.Second): + case <-time.After(15 * time.Second): c.Fatal("Build with adding to workdir timed out") case err := <-errChan: c.Assert(err, check.IsNil) diff --git a/integration-cli/docker_cli_events_test.go b/integration-cli/docker_cli_events_test.go index f7fb4341e8..cd4ad54382 100644 --- a/integration-cli/docker_cli_events_test.go +++ b/integration-cli/docker_cli_events_test.go @@ -53,7 +53,7 @@ func (s *DockerSuite) TestEventsUntag(c *check.C) { dockerCmd(c, "rmi", "utest:tag1") dockerCmd(c, "rmi", "utest:tag2") eventsCmd := exec.Command(dockerBinary, "events", "--since=1") - out, exitCode, _, err := runCommandWithOutputForDuration(eventsCmd, time.Duration(time.Millisecond*500)) + out, exitCode, _, err := runCommandWithOutputForDuration(eventsCmd, time.Duration(time.Millisecond*2500)) c.Assert(err, checker.IsNil) c.Assert(exitCode, checker.Equals, 0, check.Commentf("Failed to get events")) events := strings.Split(out, "\n") diff --git a/integration-cli/docker_cli_exec_unix_test.go b/integration-cli/docker_cli_exec_unix_test.go index a2f1f2e64a..1d718eeade 100644 --- a/integration-cli/docker_cli_exec_unix_test.go +++ b/integration-cli/docker_cli_exec_unix_test.go @@ -35,7 +35,7 @@ func (s *DockerSuite) TestExecInteractiveStdinClose(c *check.C) { c.Assert(err, checker.IsNil) output := b.String() c.Assert(strings.TrimSpace(output), checker.Equals, "hello") - case <-time.After(1 * time.Second): + case <-time.After(5 * time.Second): c.Fatal("timed out running docker exec") } } diff --git a/integration-cli/docker_cli_start_test.go b/integration-cli/docker_cli_start_test.go index 8e38c4d512..ced1559d5c 100644 --- a/integration-cli/docker_cli_start_test.go +++ b/integration-cli/docker_cli_start_test.go @@ -33,7 +33,7 @@ func (s *DockerSuite) TestStartAttachReturnsOnError(c *check.C) { select { case err := <-ch: c.Assert(err, check.IsNil) - case <-time.After(time.Second): + case <-time.After(5 * time.Second): c.Fatalf("Attach did not exit properly") } } diff --git a/integration-cli/docker_utils.go b/integration-cli/docker_utils.go index 0e71c07111..1915995e0b 100644 --- a/integration-cli/docker_utils.go +++ b/integration-cli/docker_utils.go @@ -1517,7 +1517,7 @@ func setupRegistry(c *check.C) *testRegistryV2 { c.Assert(err, check.IsNil) // Wait for registry to be ready to serve requests. - for i := 0; i != 5; i++ { + for i := 0; i != 50; i++ { if err = reg.Ping(); err == nil { break }