@@ -1,7 +1,6 @@

 package main

 import (

-	"fmt"

 	"os/exec"

 	"strings"

 	"testing"

@@ -10,23 +9,29 @@ import (

 func TestCommitAfterContainerIsDone(t *testing.T) {

 	runCmd := exec.Command(dockerBinary, "run", "-i", "-a", "stdin", "busybox", "echo", "foo")

 	out, _, _, err := runCommandWithStdoutStderr(runCmd)

-	errorOut(err, t, fmt.Sprintf("failed to run container: %v %v", out, err))

+	if err != nil {

+		t.Fatalf("failed to run container: %s, %v", out, err)

+	}

 	cleanedContainerID := stripTrailingCharacters(out)

 	waitCmd := exec.Command(dockerBinary, "wait", cleanedContainerID)

-	_, _, err = runCommandWithOutput(waitCmd)

-	errorOut(err, t, fmt.Sprintf("error thrown while waiting for container: %s", out))

+	if _, _, err = runCommandWithOutput(waitCmd); err != nil {

+		t.Fatalf("error thrown while waiting for container: %s, %v", out, err)

+	}

 	commitCmd := exec.Command(dockerBinary, "commit", cleanedContainerID)

 	out, _, err = runCommandWithOutput(commitCmd)

-	errorOut(err, t, fmt.Sprintf("failed to commit container to image: %v %v", out, err))

+	if err != nil {

+		t.Fatalf("failed to commit container to image: %s, %v", out, err)

+	}

 	cleanedImageID := stripTrailingCharacters(out)

 	inspectCmd := exec.Command(dockerBinary, "inspect", cleanedImageID)

-	out, _, err = runCommandWithOutput(inspectCmd)

-	errorOut(err, t, fmt.Sprintf("failed to inspect image: %v %v", out, err))

+	if out, _, err = runCommandWithOutput(inspectCmd); err != nil {

+		t.Fatalf("failed to inspect image: %s, %v", out, err)

+	}

 	deleteContainer(cleanedContainerID)

 	deleteImages(cleanedImageID)

@@ -37,23 +42,29 @@ func TestCommitAfterContainerIsDone(t *testing.T) {

 func TestCommitWithoutPause(t *testing.T) {

 	runCmd := exec.Command(dockerBinary, "run", "-i", "-a", "stdin", "busybox", "echo", "foo")

 	out, _, _, err := runCommandWithStdoutStderr(runCmd)

-	errorOut(err, t, fmt.Sprintf("failed to run container: %v %v", out, err))

+	if err != nil {

+		t.Fatalf("failed to run container: %s, %v", out, err)

+	}

 	cleanedContainerID := stripTrailingCharacters(out)

 	waitCmd := exec.Command(dockerBinary, "wait", cleanedContainerID)

-	_, _, err = runCommandWithOutput(waitCmd)

-	errorOut(err, t, fmt.Sprintf("error thrown while waiting for container: %s", out))

+	if _, _, err = runCommandWithOutput(waitCmd); err != nil {

+		t.Fatalf("error thrown while waiting for container: %s, %v", out, err)

+	}

 	commitCmd := exec.Command(dockerBinary, "commit", "-p=false", cleanedContainerID)

 	out, _, err = runCommandWithOutput(commitCmd)

-	errorOut(err, t, fmt.Sprintf("failed to commit container to image: %v %v", out, err))

+	if err != nil {

+		t.Fatalf("failed to commit container to image: %s, %v", out, err)

+	}

 	cleanedImageID := stripTrailingCharacters(out)

 	inspectCmd := exec.Command(dockerBinary, "inspect", cleanedImageID)

-	out, _, err = runCommandWithOutput(inspectCmd)

-	errorOut(err, t, fmt.Sprintf("failed to inspect image: %v %v", out, err))

+	if out, _, err = runCommandWithOutput(inspectCmd); err != nil {

+		t.Fatalf("failed to inspect image: %s, %v", out, err)

+	}

 	deleteContainer(cleanedContainerID)

 	deleteImages(cleanedImageID)

@@ -81,7 +92,7 @@ func TestCommitNewFile(t *testing.T) {

 		t.Fatal(err, out)

 	}

 	if actual := strings.Trim(out, "\r\n"); actual != "koye" {

-		t.Fatalf("expected output koye received %s", actual)

+		t.Fatalf("expected output koye received %q", actual)

 	}

 	deleteAllContainers()

@@ -92,7 +103,6 @@ func TestCommitNewFile(t *testing.T) {

 func TestCommitTTY(t *testing.T) {

 	cmd := exec.Command(dockerBinary, "run", "-t", "--name", "tty", "busybox", "/bin/ls")

-

 	if _, err := runCommand(cmd); err != nil {

 		t.Fatal(err)

 	}

@@ -105,7 +115,6 @@ func TestCommitTTY(t *testing.T) {

 	imageID = strings.Trim(imageID, "\r\n")

 	cmd = exec.Command(dockerBinary, "run", "ttytest", "/bin/ls")

-

 	if _, err := runCommand(cmd); err != nil {

 		t.Fatal(err)

 	}

@@ -124,6 +133,7 @@ func TestCommitWithHostBindMount(t *testing.T) {

 	if err != nil {

 		t.Fatal(imageID, err)

 	}

+

 	imageID = strings.Trim(imageID, "\r\n")

 	cmd = exec.Command(dockerBinary, "run", "bindtest", "true")