Add status conditions to namespaces

pkg/controller/namespace/deletion/namespaced_resources_deleter_test.go

@@ -137,6 +137,7 @@ func testSyncNamespaceThatIsTerminating(t *testing.T, versions *metav1.APIVersio
 		kubeClientActionSet     sets.String
 		metadataClientActionSet sets.String
 		gvrError                error
+		expectErrorOnDelete     error
 	}{
 		"pending-finalize": {
 			testNamespace: testNamespacePendingFinalize,
@@ -165,6 +166,17 @@ func testSyncNamespaceThatIsTerminating(t *testing.T, versions *metav1.APIVersio
 			metadataClientActionSet: sets.NewString(),
 			gvrError:                fmt.Errorf("test error"),
 		},
+		"groupVersionResourceErr-finalize": {
+			testNamespace: testNamespacePendingFinalize,
+			kubeClientActionSet: sets.NewString(
+				strings.Join([]string{"get", "namespaces", ""}, "-"),
+				strings.Join([]string{"list", "pods", ""}, "-"),
+				strings.Join([]string{"update", "namespaces", "status"}, "-"),
+			),
+			dynamicClientActionSet: dynamicClientActionSet,
+			gvrError:               fmt.Errorf("test error"),
+			expectErrorOnDelete:    fmt.Errorf("test error"),
+		},
 	}
 
 	for scenario, testInput := range scenarios {
@@ -179,11 +191,11 @@ func testSyncNamespaceThatIsTerminating(t *testing.T, versions *metav1.APIVersio
 		}
 
 		fn := func() ([]*metav1.APIResourceList, error) {
-			return resources, nil
+			return resources, testInput.gvrError
 		}
 		d := NewNamespacedResourcesDeleter(mockClient.CoreV1().Namespaces(), metadataClient, mockClient.CoreV1(), fn, v1.FinalizerKubernetes, true)
-		if err := d.Delete(testInput.testNamespace.Name); err != nil {
-			t.Errorf("scenario %s - Unexpected error when synching namespace %v", scenario, err)
+		if err := d.Delete(testInput.testNamespace.Name); !matchErrors(err, testInput.expectErrorOnDelete) {
+			t.Errorf("scenario %s - expected error %q when syncing namespace, got %q, %v", scenario, testInput.expectErrorOnDelete, err, testInput.expectErrorOnDelete == err)
 		}
 
 		// validate traffic from kube client
@@ -271,6 +283,17 @@ func TestSyncNamespaceThatIsActive(t *testing.T) {
 	}
 }
 
+// matchError returns true if errors match, false if they don't, compares by error message only for convenience which should be sufficient for these tests
+func matchErrors(e1, e2 error) bool {
+	if e1 == nil && e2 == nil {
+		return true
+	}
+	if e1 != nil && e2 != nil {
+		return e1.Error() == e2.Error()
+	}
+	return false
+}
+
 // testServerAndClientConfig returns a server that listens and a config that can reference it
 func testServerAndClientConfig(handler func(http.ResponseWriter, *http.Request)) (*httptest.Server, *restclient.Config) {
 	srv := httptest.NewServer(http.HandlerFunc(handler))