Merge pull request #17332 from askb/17225_flakytest_TestExecEnv

Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case.
This commit is contained in:
Vincent Demeester 2015-10-25 21:17:50 +01:00
commit c71e97fc12
1 changed files with 1 additions and 0 deletions

View File

@ -129,6 +129,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") ||