From 9a87553e4fc6c0abdd298893deefc44050208dda Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Mon, 13 Apr 2015 16:31:20 -0700 Subject: [PATCH] cleanup test wrong key.json leading to other failures wait for container to be running before trying to kill it in daemon tests Signed-off-by: Jessica Frazelle --- integration-cli/docker_cli_daemon_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index adaccc24cc..384c96803c 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -881,13 +881,12 @@ func TestDaemonwithwrongkey(t *testing.T) { } d1 := NewDaemon(t) + defer os.Remove("/etc/docker/key.json") if err := d1.Start(); err == nil { d1.Stop() - os.Remove("/etc/docker/key.json") t.Fatalf("It should not be succssful to start daemon with wrong key: %v", err) } - os.Remove("/etc/docker/key.json") content, _ := ioutil.ReadFile(d1.logFile.Name()) @@ -905,7 +904,7 @@ func TestDaemonRestartKillWait(t *testing.T) { } defer d.Stop() - out, err := d.Cmd("run", "-d", "busybox", "/bin/cat") + out, err := d.Cmd("run", "-id", "busybox", "/bin/cat") if err != nil { t.Fatalf("Could not run /bin/cat: err=%v\n%s", err, out) }