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

 package main

 import (

-	"fmt"

 	"os/exec"

 	"testing"

 )

@@ -11,11 +10,8 @@ import (

 // pulling an image from the central registry should work

 func TestPullImageFromCentralRegistry(t *testing.T) {

 	pullCmd := exec.Command(dockerBinary, "pull", "scratch")

-	out, exitCode, err := runCommandWithOutput(pullCmd)

-	errorOut(err, t, fmt.Sprintf("%s %s", out, err))

-

-	if err != nil || exitCode != 0 {

-		t.Fatal("pulling the scratch image from the registry has failed")

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

+		t.Fatal("pulling the scratch image from the registry has failed: %s, %v", out, err)

 	}

 	logDone("pull - pull scratch")

 }

@@ -23,10 +19,8 @@ func TestPullImageFromCentralRegistry(t *testing.T) {

 // pulling a non-existing image from the central registry should return a non-zero exit code

 func TestPullNonExistingImage(t *testing.T) {

 	pullCmd := exec.Command(dockerBinary, "pull", "fooblahblah1234")

-	_, exitCode, err := runCommandWithOutput(pullCmd)

-

-	if err == nil || exitCode == 0 {

-		t.Fatal("expected non-zero exit status when pulling non-existing image")

+	if out, _, err := runCommandWithOutput(pullCmd); err == nil {

+		t.Fatal("expected non-zero exit status when pulling non-existing image: %s", out)

 	}

 	logDone("pull - pull fooblahblah1234 (non-existing image)")

 }