count only active ns and wait for namespace clean up

Signed-off-by: akihikokuroda <[email protected]>

Author: akihikokuroda

test/e2e/csv_e2e_test.go

@@ -19,6 +19,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/equality"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/fields"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	k8slabels "k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -4247,6 +4248,20 @@ var _ = Describe("Disabling copied CSVs", func() {
 			return nil
 		}).Should(Succeed())
 		TeardownNamespace(ns.GetName())
+		Eventually(func() bool {
+			var namespaces corev1.NamespaceList
+			err := ctx.Ctx().Client().List(context.Background(), &namespaces,  &client.ListOptions{})
+			if err != nil || len(namespaces.Items) == 0{
+				return false
+			}
+			for _, n := range namespaces.Items {
+				if ns.GetName() == n.GetName() {
+					return false
+				}
+			}
+
+			return true
+		}).Should(BeTrue())
 	})
 
 	When("an operator is installed in AllNamespace mode", func() {
@@ -4403,7 +4418,7 @@ var _ = Describe("Disabling copied CSVs", func() {
 				}
 
 				var namespaces corev1.NamespaceList
-				if err := ctx.Ctx().Client().List(context.TODO(), &namespaces, &client.ListOptions{}); err != nil {
+				if err := ctx.Ctx().Client().List(context.TODO(), &namespaces, &client.ListOptions{FieldSelector: fields.SelectorFromSet(map[string]string{"status.phase": "Active"})}); err != nil {
 					return err
 				}