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

integration-cli: Fix race in restart loop

Browse Source 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 752a0d6f34ee3c92dc877273c33b8cd0239fda71
Component: engine
This commit is contained in:
Tibor Vass
2015-01-22 13:59:32 -05:00
parent 16972af772
commit 4cb12b37f1
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/engine/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")