fix(k8s_util_test.go): pass an api.PullPolicy

…to slugBuilderPod and dockerBuilderPod. Also check that each function
sets the policy correctly.

Author: Aaron Schlesinger

pkg/gitreceive/k8s_util_test.go

@@ -23,26 +23,28 @@ func TestSlugBuilderPodName(t *testing.T) {
 }
 
 type slugBuildCase struct {
-	debug            bool
-	name             string
-	namespace        string
-	env              map[string]interface{}
-	tarKey           string
-	putKey           string
-	buildPack        string
-	slugBuilderImage string
-	storageType      string
+	debug                      bool
+	name                       string
+	namespace                  string
+	env                        map[string]interface{}
+	tarKey                     string
+	putKey                     string
+	buildPack                  string
+	slugBuilderImage           string
+	slugBuilderImagePullPolicy api.PullPolicy
+	storageType                string
 }
 
 type dockerBuildCase struct {
-	debug              bool
-	name               string
-	namespace          string
-	env                map[string]interface{}
-	tarKey             string
-	imgName            string
-	dockerBuilderImage string
-	storageType        string
+	debug                        bool
+	name                         string
+	namespace                    string
+	env                          map[string]interface{}
+	tarKey                       string
+	imgName                      string
+	dockerBuilderImage           string
+	dockerBuilderImagePullPolicy api.PullPolicy
+	storageType                  string
 }
 
 func TestBuildPod(t *testing.T) {
@@ -54,18 +56,29 @@ func TestBuildPod(t *testing.T) {
 	var pod *api.Pod
 
 	slugBuilds := []slugBuildCase{
-		{true, "test", "default", emptyEnv, "tar", "put-url", "", "", ""},
-		{true, "test", "default", emptyEnv, "tar", "put-url", "", "", ""},
-		{true, "test", "default", env, "tar", "put-url", "", "", ""},
-		{true, "test", "default", env, "tar", "put-url", "", "", ""},
-		{true, "test", "default", emptyEnv, "tar", "put-url", "buildpack", "", ""},
-		{true, "test", "default", emptyEnv, "tar", "put-url", "buildpack", "", ""},
-		{true, "test", "default", env, "tar", "put-url", "buildpack", "", ""},
-		{true, "test", "default", env, "tar", "put-url", "buildpack", "customimage", ""},
+		{true, "test", "default", emptyEnv, "tar", "put-url", "", "", api.PullAlways, ""},
+		{true, "test", "default", emptyEnv, "tar", "put-url", "", "", api.PullAlways, ""},
+		{true, "test", "default", env, "tar", "put-url", "", "", api.PullAlways, ""},
+		{true, "test", "default", env, "tar", "put-url", "", "", api.PullAlways, ""},
+		{true, "test", "default", emptyEnv, "tar", "put-url", "buildpack", "", api.PullAlways, ""},
+		{true, "test", "default", emptyEnv, "tar", "put-url", "buildpack", "", api.PullAlways, ""},
+		{true, "test", "default", env, "tar", "put-url", "buildpack", "", api.PullAlways, ""},
+		{true, "test", "default", env, "tar", "put-url", "buildpack", "customimage", api.PullAlways, ""},
 	}
 
 	for _, build := range slugBuilds {
-		pod = slugbuilderPod(build.debug, build.name, build.namespace, build.env, build.tarKey, build.putKey, build.buildPack, build.slugBuilderImage, build.storageType)
+		pod = slugbuilderPod(
+			build.debug,
+			build.name,
+			build.namespace,
+			build.env,
+			build.tarKey,
+			build.putKey,
+			build.buildPack,
+			build.storageType,
+			build.slugBuilderImage,
+			string(build.slugBuilderImagePullPolicy),
+		)
 
 		if pod.ObjectMeta.Name != build.name {
 			t.Errorf("expected %v but returned %v ", build.name, pod.ObjectMeta.Name)
@@ -87,21 +100,36 @@ func TestBuildPod(t *testing.T) {
 				t.Errorf("expected %v but returned %v ", build.slugBuilderImage, pod.Spec.Containers[0].Image)
 			}
 		}
+		if build.slugBuilderImagePullPolicy != "" {
+			if pod.Spec.Containers[0].ImagePullPolicy != build.slugBuilderImagePullPolicy {
+				t.Errorf("expected %v but returned %v", build.slugBuilderImagePullPolicy, pod.Spec.Containers[0].ImagePullPolicy)
+			}
+		}
 	}
 
 	dockerBuilds := []dockerBuildCase{
-		{true, "test", "default", emptyEnv, "tar", "", "", ""},
-		{true, "test", "default", emptyEnv, "tar", "", "", ""},
-		{true, "test", "default", env, "tar", "", "", ""},
-		{true, "test", "default", env, "tar", "", "", ""},
-		{true, "test", "default", emptyEnv, "tar", "img", "", ""},
-		{true, "test", "default", emptyEnv, "tar", "img", "", ""},
-		{true, "test", "default", env, "tar", "img", "", ""},
-		{true, "test", "default", env, "tar", "img", "customimage", ""},
+		{true, "test", "default", emptyEnv, "tar", "", "", api.PullAlways, ""},
+		{true, "test", "default", emptyEnv, "tar", "", "", api.PullAlways, ""},
+		{true, "test", "default", env, "tar", "", "", api.PullAlways, ""},
+		{true, "test", "default", env, "tar", "", "", api.PullAlways, ""},
+		{true, "test", "default", emptyEnv, "tar", "img", "", api.PullAlways, ""},
+		{true, "test", "default", emptyEnv, "tar", "img", "", api.PullAlways, ""},
+		{true, "test", "default", env, "tar", "img", "", api.PullAlways, ""},
+		{true, "test", "default", env, "tar", "img", "customimage", api.PullAlways, ""},
 	}
 
 	for _, build := range dockerBuilds {
-		pod = dockerBuilderPod(build.debug, build.name, build.namespace, build.env, build.tarKey, build.imgName, build.dockerBuilderImage, build.storageType)
+		pod = dockerBuilderPod(
+			build.debug,
+			build.name,
+			build.namespace,
+			build.env,
+			build.tarKey,
+			build.imgName,
+			build.storageType,
+			build.dockerBuilderImage,
+			string(build.dockerBuilderImagePullPolicy),
+		)
 
 		if pod.ObjectMeta.Name != build.name {
 			t.Errorf("expected %v but returned %v ", build.name, pod.ObjectMeta.Name)
@@ -114,7 +142,14 @@ func TestBuildPod(t *testing.T) {
 		checkForEnv(t, pod, "IMG_NAME", build.imgName)
 		if build.dockerBuilderImage != "" {
 			if pod.Spec.Containers[0].Image != build.dockerBuilderImage {
-				t.Errorf("expected %v but returned %v ", build.dockerBuilderImage, pod.Spec.Containers[0].Image)
+				t.Errorf("expected %v but returned %v", build.dockerBuilderImage, pod.Spec.Containers[0].Image)
+			}
+		}
+		if build.dockerBuilderImagePullPolicy != "" {
+			if pod.Spec.Containers[0].ImagePullPolicy != "" {
+				if pod.Spec.Containers[0].ImagePullPolicy != build.dockerBuilderImagePullPolicy {
+					t.Errorf("expected %v but returned %v", build.dockerBuilderImagePullPolicy, pod.Spec.Containers[0].ImagePullPolicy)
+				}
 			}
 		}
 	}