From 1ba89992d4b35d65aa3ed1b971425e1f3326bc5e Mon Sep 17 00:00:00 2001
From: Ben Parees <bparees@redhat.com>
Date: Sun, 17 Jan 2016 11:48:49 -0500
Subject: [PATCH] return error if pull fails

---
 pkg/docker/util.go                   |  5 -----
 test/integration/integration_test.go | 17 +++++++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkg/docker/util.go b/pkg/docker/util.go
index e11b8083f..22821012b 100644
--- a/pkg/docker/util.go
+++ b/pkg/docker/util.go
@@ -182,13 +182,8 @@ func PullImage(name string, d Docker, policy api.PullPolicy, force bool) (*PullR
 	switch policy {
 	case api.PullIfNotPresent:
 		image, err = d.CheckAndPullImage(name)
-		return &PullResult{Image: image, OnBuild: d.IsImageOnBuild(name)}, err
 	case api.PullAlways:
 		image, err = d.PullImage(name)
-		if err == nil {
-			return &PullResult{Image: image, OnBuild: d.IsImageOnBuild(name)}, nil
-		}
-		fallthrough
 	case api.PullNever:
 		image, err = d.CheckImage(name)
 	}
diff --git a/test/integration/integration_test.go b/test/integration/integration_test.go
index e852d69f6..d6b182c2e 100644
--- a/test/integration/integration_test.go
+++ b/test/integration/integration_test.go
@@ -447,13 +447,14 @@ func (i *integrationTest) exerciseIncrementalBuild(tag, imageName string, remove
 
 	previousImageID := resp.ImageID
 	config = &api.Config{
-		DockerConfig:        dockerConfig(),
-		BuilderImage:        imageName,
-		BuilderPullPolicy:   api.DefaultBuilderPullPolicy,
-		Source:              TestSource,
-		Tag:                 tag,
-		Incremental:         true,
-		RemovePreviousImage: removePreviousImage,
+		DockerConfig:            dockerConfig(),
+		BuilderImage:            imageName,
+		BuilderPullPolicy:       api.DefaultBuilderPullPolicy,
+		Source:                  TestSource,
+		Tag:                     tag,
+		Incremental:             true,
+		RemovePreviousImage:     removePreviousImage,
+		PreviousImagePullPolicy: api.PullIfNotPresent,
 	}
 
 	builder, err = strategies.GetStrategy(config)
@@ -480,7 +481,7 @@ func (i *integrationTest) exerciseIncrementalBuild(tag, imageName string, remove
 		}
 	} else {
 		if err != nil {
-			t.Errorf("Coudln't find previous image %s", previousImageID)
+			t.Errorf("Couldn't find previous image %s", previousImageID)
 		}
 	}