GitList

Browse code

Cleanup errorOut resp in history test

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Jessica Frazelle authored on 2014/10/15 04:47:35
Showing 1 changed files

integration-cli/docker_cli_history_test.go index 8b1a73b..c635537 100644

integration-cli/docker_cli_history_test.go

@@ -46,9 +46,8 @@ RUN echo "Z"`,
 	}
 
 	out, exitCode, err := runCommandWithOutput(exec.Command(dockerBinary, "history", "testbuildhistory"))
-	errorOut(err, t, fmt.Sprintf("image history failed: %v %v", out, err))
 	if err != nil || exitCode != 0 {
-		t.Fatal("failed to get image history")
+		t.Fatal("failed to get image history: %s, %v", out, err)
 	}
 
 	actualValues := strings.Split(out, "\n")[1:27]

...	...	@@ -46,9 +46,8 @@ RUN echo "Z"`,
46	46	}
47	47
48	48	out, exitCode, err := runCommandWithOutput(exec.Command(dockerBinary, "history", "testbuildhistory"))
49		- errorOut(err, t, fmt.Sprintf("image history failed: %v %v", out, err))
50	49	if err != nil \|\| exitCode != 0 {
51		- t.Fatal("failed to get image history")
	50	+ t.Fatal("failed to get image history: %s, %v", out, err)
52	51	}
53	52
54	53	actualValues := strings.Split(out, "\n")[1:27]