Merge pull request #21238 from yongtang/21211-TestRestartStoppedContainer

Fix flaky test of TestRestartStoppedContainer (#21211).
Upstream-commit: 6eaf4434eed297423133b79aa162a6b60165ad2d
Component: engine

components/engine/integration-cli/docker_cli_restart_test.go

@@ -20,6 +20,10 @@ func (s *DockerSuite) TestRestartStoppedContainer(c *check.C) {
 
 	dockerCmd(c, "restart", cleanedContainerID)
 
+	// Wait until the container has stopped
+	err = waitInspect(cleanedContainerID, "{{.State.Running}}", "false", 20*time.Second)
+	c.Assert(err, checker.IsNil)
+
 	out, _ = dockerCmd(c, "logs", cleanedContainerID)
 	c.Assert(out, checker.Equals, "foobar\nfoobar\n")
 }