From f207322c0a017adcce2da04473626f040e08267c Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Fri, 15 May 2015 09:54:43 -0400 Subject: [PATCH] Extend sleep/timeout for ngoroutine check In cases where this is failing it's ok to have the test take extra time, but we don't want it to fail because of some race/performance differences between systems. So make the timeout go to 30s and double the sleep time in between checks so it's not pounding the daemon quite so fast. Originally I couldn't make this test fail (pre-change), but changed graphdrivers and saw a failure pretty quickly. This change seems to smooth that out. Signed-off-by: Brian Goff --- integration-cli/docker_cli_logs_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-cli/docker_cli_logs_test.go b/integration-cli/docker_cli_logs_test.go index 663caaf7a5..7747335132 100644 --- a/integration-cli/docker_cli_logs_test.go +++ b/integration-cli/docker_cli_logs_test.go @@ -432,7 +432,7 @@ func (s *DockerSuite) TestLogsFollowGoroutinesWithStdout(c *check.C) { c.Assert(cmd.Process.Kill(), check.IsNil) // NGoroutines is not updated right away, so we need to wait before failing - t := time.After(5 * time.Second) + t := time.After(30 * time.Second) for { select { case <-t: @@ -441,7 +441,7 @@ func (s *DockerSuite) TestLogsFollowGoroutinesWithStdout(c *check.C) { if nroutines == getNGoroutines() { return } - time.Sleep(100 * time.Millisecond) + time.Sleep(200 * time.Millisecond) } } }