1. docker
  2. Commit 0cef21cfba5b06ce7bd5d6b68865a9df0aca95fc
Browse code

Cleanup some integration-cli output

I noticed a few things that were bugging me in the output
of the integration-cli tests.
- one of the tests used println to stdout so we had garage sent to the screen
- some of the test, in their final log message, didn't include the name of
the group/file e.g. daemon - run,iptables was just run,iptables

And yes, I noticed this because I'm anal :-) but also because we should keep
the output of the tests as clean as possible so its easy to spot it when
things go bad.

Signed-off-by: Doug Davis <dug@us.ibm.com>

Doug Davis authored on 2014/11/12 01:30:07
Showing 4 changed files
integration-cli/docker_cli_daemon_test.go
History View file @ 0cef21c
... ... 
@@ -169,7 +169,7 @@ func TestDaemonIptablesClean(t *testing.T) {
169 169
170 170 
 	deleteAllContainers()
171 171
172 
-	logDone("run,iptables - iptables rules cleaned after daemon restart")
172 
+	logDone("daemon - run,iptables - iptables rules cleaned after daemon restart")
173 173 
 }
174 174
175 175 
 func TestDaemonIptablesCreate(t *testing.T) {
... ... 
@@ -221,5 +221,5 @@ func TestDaemonIptablesCreate(t *testing.T) {
221 221
222 222 
 	deleteAllContainers()
223 223
224 
-	logDone("run,iptables - iptables rules for always restarted container created after daemon restart")
224 
+	logDone("daemon - run,iptables - iptables rules for always restarted container created after daemon restart")
225 225 
 }
integration-cli/docker_cli_exec_test.go
History View file @ 0cef21c
... ... 
@@ -40,7 +40,6 @@ func TestExecInteractiveStdinClose(t *testing.T) {
40 40 
 	}
41 41
42 42 
 	contId := strings.TrimSpace(out)
43 
-	println(contId)
44 43
45 44 
 	returnchan := make(chan struct{})
46 45
integration-cli/docker_cli_rmi_test.go
History View file @ 0cef21c
... ... 
@@ -74,7 +74,7 @@ func TestRmiTag(t *testing.T) {
74 74 
 		}
75 75
76 76 
 	}
77 
-	logDone("tag,rmi- tagging the same images multiple times then removing tags")
77 
+	logDone("rmi - tag,rmi- tagging the same images multiple times then removing tags")
78 78 
 }
79 79
80 80 
 func TestRmiTagWithExistingContainers(t *testing.T) {
integration-cli/docker_cli_save_load_test.go
History View file @ 0cef21c
... ... 
@@ -71,8 +71,7 @@ func TestSaveAndLoadRepoStdout(t *testing.T) {
71 71
72 72 
 	os.Remove("/tmp/foobar-save-load-test.tar")
73 73
74 
-	logDone("save - save a repo using stdout")
75 
-	logDone("load - load a repo using stdout")
74 
+	logDone("save - save/load a repo using stdout")
76 75
77 76 
 	pty, tty, err := pty.Open()
78 77 
 	if err != nil {
... ... 
@@ -228,8 +227,7 @@ func TestSaveAndLoadRepoFlags(t *testing.T) {
228 228
229 229 
 	os.Remove("/tmp/foobar-save-load-test.tar")
230 230
231 
-	logDone("save - save a repo using -o")
232 
-	logDone("load - load a repo using -i")
231 
+	logDone("save - save a repo using -o && load a repo using -i")
233 232 
 }
234 233
235 234 
 func TestSaveMultipleNames(t *testing.T) {