docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-13 18:22:35 +03:00
Code Activity

Merge pull request #22324 from WeiZhang555/fix-test-case

Browse Source 
Fix test case
Upstream-commit: 4925fcbe2e5db8e44d48af0ec12b2badb7af1752
Component: engine
This commit is contained in:
Brian Goff
2016-04-26 15:01:02 -04:00
parent a7df8827dc c44b17ce8b
commit 421a9caea1
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
components/engine/integration-cli/docker_cli_restart_test.go
View File

@@ -225,22 +225,15 @@ func (s *DockerSuite) TestRestartContainerwithRestartPolicy(c *check.C) {
id1 := strings.TrimSpace(string(out1))
id2 := strings.TrimSpace(string(out2))
err := waitInspect(id1, "{{ .State.Restarting }} {{ .State.Running }}", "false false", 30*time.Second)
waitTimeout := 15 * time.Second
if daemonPlatform == "windows" {
waitTimeout = 150 * time.Second
}
err := waitInspect(id1, "{{ .State.Restarting }} {{ .State.Running }}", "false false", waitTimeout)
c.Assert(err, checker.IsNil)
// TODO: fix racey problem during restart:
// https://jenkins.dockerproject.org/job/Docker-PRs-Win2Lin/24665/console
// Error response from daemon: Cannot restart container 6655f620d90b390527db23c0a15b3e46d86a58ecec20a5697ab228d860174251: remove /var/run/docker/libcontainerd/6655f620d90b390527db23c0a15b3e46d86a58ecec20a5697ab228d860174251/rootfs: device or resource busy
if _, _, err := dockerCmdWithError("restart", id1); err != nil {
// if restart met racey problem, try again
time.Sleep(500 * time.Millisecond)
dockerCmd(c, "restart", id1)
}
if _, _, err := dockerCmdWithError("restart", id2); err != nil {
// if restart met racey problem, try again
time.Sleep(500 * time.Millisecond)
dockerCmd(c, "restart", id2)
}
dockerCmd(c, "restart", id1)
dockerCmd(c, "restart", id2)
dockerCmd(c, "stop", id1)
dockerCmd(c, "stop", id2)