浏览代码

Removed race in e2e test

Signed-off-by: Guillaume Tardif <[email protected]>
Guillaume Tardif 4 年之前
父节点
当前提交
ac1696e47b
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      local/e2e/compose/restart_test.go

+ 3 - 2
local/e2e/compose/restart_test.go

@@ -45,8 +45,9 @@ func TestRestart(t *testing.T) {
 		res := c.RunDockerOrExitError("compose", "-f", "./fixtures/restart-test/compose.yml", "--project-name", projectName, "up", "-d")
 		res := c.RunDockerOrExitError("compose", "-f", "./fixtures/restart-test/compose.yml", "--project-name", projectName, "up", "-d")
 		assert.Assert(t, strings.Contains(res.Combined(), "Container e2e-restart_restart_1  Started"), res.Combined())
 		assert.Assert(t, strings.Contains(res.Combined(), "Container e2e-restart_restart_1  Started"), res.Combined())
 
 
-		// Give the time for it to exit
-		time.Sleep(time.Second)
+		c.WaitForCmdResult(c.NewDockerCmd("compose", "--project-name", projectName, "ps", "-a", "--format", "json"),
+			StdoutContains(`"State":"exited"`),
+			10*time.Second, 1*time.Second)
 
 
 		res = c.RunDockerOrExitError("compose", "--project-name", projectName, "ps", "-a")
 		res = c.RunDockerOrExitError("compose", "--project-name", projectName, "ps", "-a")
 		testify.Regexp(t, getServiceRegx("restart", "exited"), res.Stdout())
 		testify.Regexp(t, getServiceRegx("restart", "exited"), res.Stdout())