docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12262 from YanFeng-Adam/daemon 

A wrong key.json would remain if the TestDaemonwithwrongkey case fails. The issue would lead to failure of other cases.
This commit is contained in:
Evan Hazlett 2015-04-13 16:00:20 -04:00
parent afd973c497 bfc68d10ed
commit 6b40377c18
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
integration-cli/docker_cli_daemon_test.go
View File

@ -884,8 +884,10 @@ func TestDaemonwithwrongkey(t *testing.T) {
if err := d1.Start(); err == nil { if err := d1.Start(); err == nil {
d1.Stop() d1.Stop()
os.Remove("/etc/docker/key.json")
t.Fatalf("It should not be succssful to start daemon with wrong key: %v", err) 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()) content, _ := ioutil.ReadFile(d1.logFile.Name())
@ -893,7 +895,6 @@ func TestDaemonwithwrongkey(t *testing.T) {
t.Fatal("Missing KeyID message from daemon logs") 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") logDone("daemon - it should be failed to start daemon with wrong key")
} }