Merge pull request #21953 from Microsoft/jjh/containerapipostcontainerstop

Windows: Fix deamon deadlock in docker stop Upstream-commit: d954097c0b9e48010f980217167af6b40cf97e58 Component: engine
2016-04-13 13:28:59 -04:00
parent 4447d74a76 312476d137
commit 05c398dfb7
2 changed files with 2 additions and 6 deletions
@@ -1231,7 +1231,7 @@ func (s *DockerSuite) TestContainerApiPostContainerStop(c *check.C) {
 	c.Assert(err, checker.IsNil)
 	// 204 No Content is expected, not 200
 	c.Assert(statusCode, checker.Equals, http.StatusNoContent)
-	c.Assert(waitInspect(containerID, "{{ .State.Running  }}", "false", 5*time.Second), checker.IsNil)
+	c.Assert(waitInspect(containerID, "{{ .State.Running  }}", "false", 60*time.Second), checker.IsNil)
 }

 // #14170