kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #10282 from tiborvass/fix-test-restart-policy-always 

integration-cli: Fix race in restart loop
This commit is contained in:
Arnaud Porterie 2015-01-22 13:17:23 -08:00
parent 10ab6dcb4f 752a0d6f34
commit 5a6f84ce08
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
integration-cli/docker_cli_restart_test.go
View File

@ -152,7 +152,7 @@ func TestRestartWithVolumes(t *testing.T) {
logDone("restart - does not create a new volume on restart")
}
func TestRecordRestartPolicyNO(t *testing.T) {
func TestRestartPolicyNO(t *testing.T) {
defer deleteAllContainers()
cmd := exec.Command(dockerBinary, "run", "-d", "--restart=no", "busybox", "false")
@ -173,7 +173,7 @@ func TestRecordRestartPolicyNO(t *testing.T) {
logDone("restart - recording restart policy name for --restart=no")
}
func TestRecordRestartPolicyAlways(t *testing.T) {
func TestRestartPolicyAlways(t *testing.T) {
defer deleteAllContainers()
cmd := exec.Command(dockerBinary, "run", "-d", "--restart=always", "busybox", "false")
@ -191,16 +191,10 @@ func TestRecordRestartPolicyAlways(t *testing.T) {
t.Fatalf("Container restart policy name is %s, expected %s", name, "always")
}
cmd = exec.Command(dockerBinary, "stop", id)
out, _, err = runCommandWithOutput(cmd)
if err != nil {
t.Fatal(err, out)
}
logDone("restart - recording restart policy name for --restart=always")
}
func TestRecordRestartPolicyOnFailure(t *testing.T) {
func TestRestartPolicyOnFailure(t *testing.T) {
defer deleteAllContainers()
cmd := exec.Command(dockerBinary, "run", "-d", "--restart=on-failure:1", "busybox", "false")