tests: delete namespace until not found

Kuadrant · Apr 23, 2024 · 3521192 · 3521192
1 parent bed695f
commit 3521192
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/controllers/helper_test.go b/controllers/helper_test.go
@@ -122,27 +122,24 @@ func CreateNamespace(namespace *string) {
 func DeleteNamespaceCallbackWithContext(ctx context.Context, namespace *string) {
 	desiredTestNamespace := &v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: *namespace}}
 	Eventually(func(g Gomega) {
-		err := k8sClient.Delete(ctx, desiredTestNamespace, client.PropagationPolicy(metav1.DeletePropagationForeground))
+		testClient().Delete(ctx, desiredTestNamespace, client.PropagationPolicy(metav1.DeletePropagationForeground))
+		existingNamespace := &v1.Namespace{}
+		err := testClient().Get(ctx, types.NamespacedName{Name: *namespace}, existingNamespace)
 		g.Expect(err).ToNot(BeNil())
 		g.Expect(apierrors.IsNotFound(err)).To(BeTrue())
 	}).WithContext(ctx).Should(Succeed())
 
 }
 
 func DeleteNamespaceCallback(namespace *string) func() {
+	desiredTestNamespace := &v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: *namespace}}
 	return func() {
-		desiredTestNamespace := &v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: *namespace}}
-		err := testClient().Delete(context.Background(), desiredTestNamespace, client.PropagationPolicy(metav1.DeletePropagationForeground))
-
-		Expect(err).ToNot(HaveOccurred())
-
-		existingNamespace := &v1.Namespace{}
-		Eventually(func() bool {
+		Eventually(func(g Gomega) {
+			testClient().Delete(context.Background(), desiredTestNamespace, client.PropagationPolicy(metav1.DeletePropagationForeground))
+			existingNamespace := &v1.Namespace{}
 			err := testClient().Get(context.Background(), types.NamespacedName{Name: *namespace}, existingNamespace)
-			if err != nil && apierrors.IsNotFound(err) {
-				return true
-			}
-			return false
+			g.Expect(err).ToNot(BeNil())
+			g.Expect(apierrors.IsNotFound(err)).To(BeTrue())
 		}, 3*time.Minute, 2*time.Second).Should(BeTrue())
 	}
 }