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 <askb23@gmail.com>
Upstream-commit: 6d974ec19d2f484586ec57c2e2455a6de927cddf
Component: engine
This commit is contained in:
Anil Belur
2015-10-24 18:52:23 +05:30
parent cfbc916dd7
commit 082dcadcb4

View File

@ -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") ||