From 6d974ec19d2f484586ec57c2e2455a6de927cddf Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Sat, 24 Oct 2015 18:52:23 +0530 Subject: [PATCH] Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case. This is done by calling waitRun() followed by the docker run, which ensures the container is loaded before calling docker exec to obtain the env variable set previously. Incorporated the change as suggeted by duglin. Signed-off-by: Anil Belur --- integration-cli/docker_cli_exec_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/integration-cli/docker_cli_exec_test.go b/integration-cli/docker_cli_exec_test.go index bb79384539..acd093a6f3 100644 --- a/integration-cli/docker_cli_exec_test.go +++ b/integration-cli/docker_cli_exec_test.go @@ -127,6 +127,7 @@ func (s *DockerSuite) TestExecEnv(c *check.C) { testRequires(c, DaemonIsLinux) dockerCmd(c, "run", "-e", "LALA=value1", "-e", "LALA=value2", "-d", "--name", "testing", "busybox", "top") + c.Assert(waitRun("testing"), check.IsNil) out, _ := dockerCmd(c, "exec", "testing", "env") if strings.Contains(out, "LALA=value1") ||