Browse Source

A wrong key.json would remain if the TestDaemonwithwrongkey case fails. The issue would lead to failure of other cases.

Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Yan Feng 10 years ago
parent
commit
bfc68d10ed
1 changed files with 2 additions and 1 deletions
  1. 2 1
      integration-cli/docker_cli_daemon_test.go

+ 2 - 1
integration-cli/docker_cli_daemon_test.go

@@ -884,8 +884,10 @@ func TestDaemonwithwrongkey(t *testing.T) {
 
 	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())
 
@@ -893,6 +895,5 @@ func TestDaemonwithwrongkey(t *testing.T) {
 		t.Fatal("Missing KeyID message from daemon logs")
 	}
 
-	os.Remove("/etc/docker/key.json")
 	logDone("daemon - it should be failed to start daemon with wrong key")
 }