Browse Source

Cleanup errorOut resp in tag test

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Jessica Frazelle 10 years ago
parent
commit
475235ba7e
1 changed files with 9 additions and 5 deletions
  1. 9 5
      integration-cli/docker_cli_tag_test.go

+ 9 - 5
integration-cli/docker_cli_tag_test.go

@@ -13,8 +13,9 @@ func TestTagUnprefixedRepoByName(t *testing.T) {
 	}
 
 	tagCmd := exec.Command(dockerBinary, "tag", "busybox:latest", "testfoobarbaz")
-	out, _, err := runCommandWithOutput(tagCmd)
-	errorOut(err, t, fmt.Sprintf("%v %v", out, err))
+	if out, _, err := runCommandWithOutput(tagCmd); err != nil {
+		t.Fatal(out, err)
+	}
 
 	deleteImages("testfoobarbaz")
 
@@ -25,12 +26,15 @@ func TestTagUnprefixedRepoByName(t *testing.T) {
 func TestTagUnprefixedRepoByID(t *testing.T) {
 	getIDCmd := exec.Command(dockerBinary, "inspect", "-f", "{{.Id}}", "busybox")
 	out, _, err := runCommandWithOutput(getIDCmd)
-	errorOut(err, t, fmt.Sprintf("failed to get the image ID of busybox: %v", err))
+	if err != nil {
+		t.Fatalf("failed to get the image ID of busybox: %s, %v", out, err)
+	}
 
 	cleanedImageID := stripTrailingCharacters(out)
 	tagCmd := exec.Command(dockerBinary, "tag", cleanedImageID, "testfoobarbaz")
-	out, _, err = runCommandWithOutput(tagCmd)
-	errorOut(err, t, fmt.Sprintf("%s %s", out, err))
+	if out, _, err = runCommandWithOutput(tagCmd); err != nil {
+		t.Fatal(out, err)
+	}
 
 	deleteImages("testfoobarbaz")