Added test cases for HandleBuildPodDeletion and HandleBuildDeletion

methods in build controller.
cucushift · Jul 10, 2015 · c834fb1 · c834fb1
1 parent 08f6608
commit c834fb1
Show file tree

Hide file tree

Showing 3 changed files with 241 additions and 7 deletions.
diff --git a/pkg/build/controller/controller_test.go b/pkg/build/controller/controller_test.go
@@ -644,3 +644,240 @@ func TestCancelBuild(t *testing.T) {
 		}
 	}
 }
+
+type customPodManager struct {
+	CreatePodFunc func(namespace string, pod *kapi.Pod) (*kapi.Pod, error)
+	DeletePodFunc func(namespace string, pod *kapi.Pod) error
+	GetPodFunc    func(namespace, name string) (*kapi.Pod, error)
+}
+
+func (c *customPodManager) CreatePod(namespace string, pod *kapi.Pod) (*kapi.Pod, error) {
+	return c.CreatePodFunc(namespace, pod)
+}
+
+func (c *customPodManager) DeletePod(namespace string, pod *kapi.Pod) error {
+	return c.DeletePodFunc(namespace, pod)
+}
+
+func (c *customPodManager) GetPod(namespace, name string) (*kapi.Pod, error) {
+	return c.GetPodFunc(namespace, name)
+}
+
+func TestHandleHandleBuildDeletionOK(t *testing.T) {
+	deleteWasCalled := false
+	build := mockBuild(buildapi.BuildStatusComplete, buildapi.BuildOutput{})
+	ctrl := BuildDeleteController{&customPodManager{
+		GetPodFunc: func(namespace, names string) (*kapi.Pod, error) {
+			return &kapi.Pod{ObjectMeta: kapi.ObjectMeta{Labels: map[string]string{buildapi.BuildLabel: build.Name}}}, nil
+		},
+		DeletePodFunc: func(namespace string, pod *kapi.Pod) error {
+			deleteWasCalled = true
+			return nil
+		},
+	}}
+
+	err := ctrl.HandleBuildDeletion(build)
+	if err != nil {
+		t.Errorf("Unexpected error %v", err)
+	}
+	if !deleteWasCalled {
+		t.Error("DeletePod was not called when it should!")
+	}
+}
+
+func TestHandleHandleBuildDeletionFailGetPod(t *testing.T) {
+	build := mockBuild(buildapi.BuildStatusComplete, buildapi.BuildOutput{})
+	ctrl := BuildDeleteController{&customPodManager{
+		GetPodFunc: func(namespace, name string) (*kapi.Pod, error) {
+			return nil, errors.New("random")
+		},
+	}}
+
+	err := ctrl.HandleBuildDeletion(build)
+	if err == nil {
+		t.Error("Expected random error got none!")
+	}
+}
+
+func TestHandleHandleBuildDeletionGetPodNotFound(t *testing.T) {
+	deleteWasCalled := false
+	build := mockBuild(buildapi.BuildStatusComplete, buildapi.BuildOutput{})
+	ctrl := BuildDeleteController{&customPodManager{
+		GetPodFunc: func(namespace, name string) (*kapi.Pod, error) {
+			return nil, kerrors.NewNotFound("Pod", name)
+		},
+		DeletePodFunc: func(namespace string, pod *kapi.Pod) error {
+			deleteWasCalled = true
+			return nil
+		},
+	}}
+
+	err := ctrl.HandleBuildDeletion(build)
+	if err != nil {
+		t.Errorf("Unexpected error, %v", err)
+	}
+	if deleteWasCalled {
+		t.Error("DeletePod was called when it should not!")
+	}
+}
+
+func TestHandleHandleBuildDeletionMismatchedLabels(t *testing.T) {
+	deleteWasCalled := false
+	build := mockBuild(buildapi.BuildStatusComplete, buildapi.BuildOutput{})
+	ctrl := BuildDeleteController{&customPodManager{
+		GetPodFunc: func(namespace, names string) (*kapi.Pod, error) {
+			return &kapi.Pod{}, nil
+		},
+		DeletePodFunc: func(namespace string, pod *kapi.Pod) error {
+			deleteWasCalled = true
+			return nil
+		},
+	}}
+
+	err := ctrl.HandleBuildDeletion(build)
+	if err != nil {
+		t.Errorf("Unexpected error %v", err)
+	}
+	if deleteWasCalled {
+		t.Error("DeletePod was called when it should not!")
+	}
+}
+
+func TestHandleHandleBuildDeletionDeletePodError(t *testing.T) {
+	build := mockBuild(buildapi.BuildStatusComplete, buildapi.BuildOutput{})
+	ctrl := BuildDeleteController{&customPodManager{
+		GetPodFunc: func(namespace, names string) (*kapi.Pod, error) {
+			return &kapi.Pod{ObjectMeta: kapi.ObjectMeta{Labels: map[string]string{buildapi.BuildLabel: build.Name}}}, nil
+		},
+		DeletePodFunc: func(namespace string, pod *kapi.Pod) error {
+			return errors.New("random")
+		},
+	}}
+
+	err := ctrl.HandleBuildDeletion(build)
+	if err == nil {
+		t.Error("Expected random error got none!")
+	}
+}
+
+type customBuildUpdater struct {
+	UpdateFunc func(namespace string, build *buildapi.Build) error
+}
+
+func (c *customBuildUpdater) Update(namespace string, build *buildapi.Build) error {
+	return c.UpdateFunc(namespace, build)
+}
+
+func mockBuildPodDeleteController(build *buildapi.Build, buildUpdater *customBuildUpdater, err error) *BuildPodDeleteController {
+	return &BuildPodDeleteController{
+		BuildStore:   buildtest.FakeBuildStore{Build: build, Err: err},
+		BuildUpdater: buildUpdater,
+	}
+}
+
+func TestHandleBuildPodDeletionOK(t *testing.T) {
+	updateWasCalled := false
+	// only not finished build (buildutil.IsBuildComplete) should be handled
+	build := mockBuild(buildapi.BuildStatusRunning, buildapi.BuildOutput{})
+	ctrl := mockBuildPodDeleteController(build, &customBuildUpdater{
+		UpdateFunc: func(namespace string, build *buildapi.Build) error {
+			updateWasCalled = true
+			return nil
+		},
+	}, nil)
+	pod := mockPod(kapi.PodSucceeded, 0)
+
+	err := ctrl.HandleBuildPodDeletion(pod)
+	if err != nil {
+		t.Errorf("Unexpected error %v", err)
+	}
+	if !updateWasCalled {
+		t.Error("UpdateBuild was not called when it should!")
+	}
+}
+
+func TestHandleBuildPodDeletionOKFinishedBuild(t *testing.T) {
+	updateWasCalled := false
+	// finished build buildutil.IsBuildComplete should not be handled
+	build := mockBuild(buildapi.BuildStatusComplete, buildapi.BuildOutput{})
+	ctrl := mockBuildPodDeleteController(build, &customBuildUpdater{
+		UpdateFunc: func(namespace string, build *buildapi.Build) error {
+			updateWasCalled = true
+			return nil
+		},
+	}, nil)
+	pod := mockPod(kapi.PodSucceeded, 0)
+
+	err := ctrl.HandleBuildPodDeletion(pod)
+	if err != nil {
+		t.Errorf("Unexpected error %v", err)
+	}
+	if updateWasCalled {
+		t.Error("UpdateBuild was called when it should not!")
+	}
+}
+
+func TestHandleBuildPodDeletionOKErroneousBuild(t *testing.T) {
+	updateWasCalled := false
+	// erroneous builds should not be handled
+	build := mockBuild(buildapi.BuildStatusError, buildapi.BuildOutput{})
+	ctrl := mockBuildPodDeleteController(build, &customBuildUpdater{
+		UpdateFunc: func(namespace string, build *buildapi.Build) error {
+			updateWasCalled = true
+			return nil
+		},
+	}, nil)
+	pod := mockPod(kapi.PodSucceeded, 0)
+
+	err := ctrl.HandleBuildPodDeletion(pod)
+	if err != nil {
+		t.Errorf("Unexpected error %v", err)
+	}
+	if updateWasCalled {
+		t.Error("UpdateBuild was called when it should not!")
+	}
+}
+
+func TestHandleBuildPodDeletionBuildGetError(t *testing.T) {
+	ctrl := mockBuildPodDeleteController(nil, &customBuildUpdater{}, errors.New("random"))
+	pod := mockPod(kapi.PodSucceeded, 0)
+
+	err := ctrl.HandleBuildPodDeletion(pod)
+	if err == nil {
+		t.Error("Expected random error, but got none!")
+	}
+}
+
+func TestHandleBuildPodDeletionBuildNotExists(t *testing.T) {
+	updateWasCalled := false
+	ctrl := mockBuildPodDeleteController(nil, &customBuildUpdater{
+		UpdateFunc: func(namespace string, build *buildapi.Build) error {
+			updateWasCalled = true
+			return nil
+		},
+	}, nil)
+	pod := mockPod(kapi.PodSucceeded, 0)
+
+	err := ctrl.HandleBuildPodDeletion(pod)
+	if err != nil {
+		t.Errorf("Unexpected error %v", err)
+	}
+	if updateWasCalled {
+		t.Error("UpdateBuild was called when it should not!")
+	}
+}
+
+func TestHandleBuildPodDeletionBuildUpdateError(t *testing.T) {
+	build := mockBuild(buildapi.BuildStatusRunning, buildapi.BuildOutput{})
+	ctrl := mockBuildPodDeleteController(build, &customBuildUpdater{
+		UpdateFunc: func(namespace string, build *buildapi.Build) error {
+			return errors.New("random")
+		},
+	}, nil)
+	pod := mockPod(kapi.PodSucceeded, 0)
+
+	err := ctrl.HandleBuildPodDeletion(pod)
+	if err == nil {
+		t.Error("Expected random error, but got none!")
+	}
+}
diff --git a/pkg/build/controller/test/fake_build_store.go b/pkg/build/controller/test/fake_build_store.go
@@ -38,13 +38,13 @@ func (s FakeBuildStore) ContainedIDs() util.StringSet {
 	return util.NewStringSet()
 }
 
-func (s FakeBuildStore) Get(obj interface{}) (item interface{}, exists bool, err error) {
+func (s FakeBuildStore) Get(obj interface{}) (interface{}, bool, error) {
 	return s.GetByKey("")
 }
 
-func (s FakeBuildStore) GetByKey(id string) (item interface{}, exists bool, err error) {
+func (s FakeBuildStore) GetByKey(id string) (interface{}, bool, error) {
 	if s.Err != nil {
-		return nil, false, err
+		return nil, false, s.Err
 	}
 	if s.Build == nil {
 		return nil, false, nil

diff --git a/pkg/build/util/util.go b/pkg/build/util/util.go
@@ -63,8 +63,5 @@ func NameFromImageStream(namespace string, ref *kapi.ObjectReference, tag string
 
 // IsBuildComplete returns whether the provided build is complete or not
 func IsBuildComplete(build *buildapi.Build) bool {
-	if build.Status.Phase != buildapi.BuildPhaseRunning && build.Status.Phase != buildapi.BuildPhasePending && build.Status.Phase != buildapi.BuildPhaseNew {
-		return true
-	}
-	return false
+	return build.Status.Phase != buildapi.BuildPhaseRunning && build.Status.Phase != buildapi.BuildPhasePending && build.Status.Phase != buildapi.BuildPhaseNew
 }