Merge pull request #1480 from gtardif/e2e_restart_race

Removed race in e2e test

Author: ndeloof

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")
 		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")
 		testify.Regexp(t, getServiceRegx("restart", "exited"), res.Stdout())