From 752a0d6f34ee3c92dc877273c33b8cd0239fda71 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Thu, 22 Jan 2015 13:59:32 -0500 Subject: [PATCH] integration-cli: Fix race in restart loop Signed-off-by: Tibor Vass --- integration-cli/docker_cli_restart_test.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/integration-cli/docker_cli_restart_test.go b/integration-cli/docker_cli_restart_test.go index 93821f7260..fc82023b2d 100644 --- a/integration-cli/docker_cli_restart_test.go +++ b/integration-cli/docker_cli_restart_test.go @@ -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")