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

Merge pull request #9091 from duglin/CleanupIntTests 

Cleanup some integration-cli output
This commit is contained in:
Jessie Frazelle 2014-11-11 10:56:29 -07:00
parent 2a517fe103 0cef21cfba
commit a131032422
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration-cli/docker_cli_daemon_test.go
View File

@ -169,7 +169,7 @@ func TestDaemonIptablesClean(t *testing.T) {
deleteAllContainers()
logDone("run,iptables - iptables rules cleaned after daemon restart")
logDone("daemon - run,iptables - iptables rules cleaned after daemon restart")
}
func TestDaemonIptablesCreate(t *testing.T) {
@ -221,5 +221,5 @@ func TestDaemonIptablesCreate(t *testing.T) {
deleteAllContainers()
logDone("run,iptables - iptables rules for always restarted container created after daemon restart")
logDone("daemon - run,iptables - iptables rules for always restarted container created after daemon restart")
}

1
integration-cli/docker_cli_exec_test.go
View File

@ -40,7 +40,6 @@ func TestExecInteractiveStdinClose(t *testing.T) {
}
contId := strings.TrimSpace(out)
println(contId)
returnchan := make(chan struct{})

2
integration-cli/docker_cli_rmi_test.go
View File

@ -74,7 +74,7 @@ func TestRmiTag(t *testing.T) {
}
}
logDone("tag,rmi- tagging the same images multiple times then removing tags")
logDone("rmi - tag,rmi- tagging the same images multiple times then removing tags")
}
func TestRmiTagWithExistingContainers(t *testing.T) {

6
integration-cli/docker_cli_save_load_test.go
View File

@ -71,8 +71,7 @@ func TestSaveAndLoadRepoStdout(t *testing.T) {
os.Remove("/tmp/foobar-save-load-test.tar")
logDone("save - save a repo using stdout")
logDone("load - load a repo using stdout")
logDone("save - save/load a repo using stdout")
pty, tty, err := pty.Open()
if err != nil {
@ -228,8 +227,7 @@ func TestSaveAndLoadRepoFlags(t *testing.T) {
os.Remove("/tmp/foobar-save-load-test.tar")
logDone("save - save a repo using -o")
logDone("load - load a repo using -i")
logDone("save - save a repo using -o && load a repo using -i")
}
func TestSaveMultipleNames(t *testing.T) {