Merge pull request #9034 from krsacme/krsacme/bc_delete_wrong_message

Merged by openshift-bot

Author: OpenShift Bot

pkg/build/reaper/reaper.go

@@ -31,7 +31,6 @@ type BuildConfigReaper struct {
 // Stop deletes the build configuration and all of the associated builds.
 func (reaper *BuildConfigReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *kapi.DeleteOptions) error {
 	noBcFound := false
-	noBuildFound := true
 
 	// Add deletion pending annotation to the build config
 	err := unversioned.RetryOnConflict(unversioned.DefaultRetry, func() error {
@@ -60,6 +59,10 @@ func (reaper *BuildConfigReaper) Stop(namespace, name string, timeout time.Durat
 		return err
 	}
 
+	if noBcFound {
+		return kerrors.NewNotFound(buildapi.Resource("buildconfig"), name)
+	}
+
 	// Warn the user if the BuildConfig won't get deleted after this point.
 	bcDeleted := false
 	defer func() {
@@ -84,7 +87,6 @@ func (reaper *BuildConfigReaper) Stop(namespace, name string, timeout time.Durat
 				}
 			}
 		}
-		noBuildFound = false
 		if err := reaper.oc.Builds(namespace).Delete(build.Name); err != nil {
 			glog.Warningf("Cannot delete Build %s/%s: %v", build.Namespace, build.Name, err)
 			if !kerrors.IsNotFound(err) {
@@ -100,7 +102,6 @@ func (reaper *BuildConfigReaper) Stop(namespace, name string, timeout time.Durat
 		return err
 	}
 	for _, build := range builds.Items {
-		noBuildFound = false
 		if err := reaper.oc.Builds(namespace).Delete(build.Name); err != nil {
 			glog.Warningf("Cannot delete Build %s/%s: %v", build.Namespace, build.Name, err)
 			if !kerrors.IsNotFound(err) {
@@ -122,9 +123,5 @@ func (reaper *BuildConfigReaper) Stop(namespace, name string, timeout time.Durat
 	}
 	bcDeleted = true
 
-	if noBcFound && noBuildFound {
-		return kerrors.NewNotFound(buildapi.Resource("buildconfig"), name)
-	}
-
 	return nil
 }

pkg/build/reaper/reaper_test.go

@@ -149,23 +149,10 @@ func TestStop(t *testing.T) {
 			},
 			err: false,
 		},
-		"no config, some builds": {
-			oc: newBuildListFake(makeBuildList(2)),
+		"no config, no or some builds": {
+			oc: testclient.NewSimpleFake(notFound(), makeBuildList(2)),
 			expected: []ktestclient.Action{
 				ktestclient.NewGetAction("buildconfigs", "default", configName),
-				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelector(configName)}),
-				ktestclient.NewDeleteAction("builds", "default", "build-1"),
-				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelectorDeprecated(configName)}),
-				ktestclient.NewDeleteAction("builds", "default", "build-2"),
-			},
-			err: false,
-		},
-		"no config, no builds": {
-			oc: testclient.NewSimpleFake(notFound()),
-			expected: []ktestclient.Action{
-				ktestclient.NewGetAction("buildconfigs", "default", configName),
-				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelector(configName)}),
-				ktestclient.NewListAction("builds", "default", kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelectorDeprecated(configName)}),
 			},
 			err: true,
 		},