Remove ordering on e2e tests

jan-law · Magic Mirror · commit c511aaa930cf · 2025-10-08T14:24:31.000Z
Tests dryrun scenarios in any order. Refactored namespace creation/deletion before and after each test Entry in DescribeTable. Eventually() will retry the dryrun command to wait for any duplicate resources pending deletion from previous test cases. ref: https://issues.redhat.com/browse/ACM-22932 Assisted by Cursor. Signed-off-by: Janelle Law <jalaw@redhat.com> (cherry picked from commit d2c11fc2add9006ac871b0547d5591f94d8076ad)
diff --git a/test/dryrun/context_vars/object_cluster_scoped/input_ns.yaml b/test/dryrun/context_vars/object_cluster_scoped/input_ns.yaml
diff --git a/test/dryrun/context_vars/object_namespaced/input.yaml b/test/dryrun/context_vars/object_namespaced/input.yaml
@@ -1,12 +1,5 @@
 ---
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: mega-mart
-  labels:
-    box: big
----
-apiVersion: v1
 kind: ConfigMap
 metadata:
   name: inventory
diff --git a/test/dryrun/context_vars/object_namespaced/input_ns.yaml b/test/dryrun/context_vars/object_namespaced/input_ns.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: mega-mart
+  labels:
+    box: big
+
diff --git a/test/dryrun/context_vars/object_pod_default_func/input.yaml b/test/dryrun/context_vars/object_pod_default_func/input.yaml
@@ -1,10 +1,5 @@
 ---
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: dangler
----
-apiVersion: v1
 kind: Pod
 metadata:
   name: nginx-pod
diff --git a/test/dryrun/context_vars/object_pod_default_func/input_ns.yaml b/test/dryrun/context_vars/object_pod_default_func/input_ns.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: dangler
+
diff --git a/test/dryrun/context_vars/object_pod_nsselector/input.yaml b/test/dryrun/context_vars/object_pod_nsselector/input.yaml
@@ -1,10 +1,5 @@
 ---
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: dangler
----
-apiVersion: v1
 kind: Pod
 metadata:
   name: nginx-pod
diff --git a/test/dryrun/context_vars/object_pod_nsselector/input_ns.yaml b/test/dryrun/context_vars/object_pod_nsselector/input_ns.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: dangler
+
diff --git a/test/dryrun/context_vars/object_templated_ns/input.yaml b/test/dryrun/context_vars/object_templated_ns/input.yaml
@@ -1,12 +1,5 @@
 ---
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: mega-mart
-  labels:
-    box: big
----
-apiVersion: v1
 kind: ConfigMap
 metadata:
   name: inventory
diff --git a/test/dryrun/context_vars/object_templated_ns/input_ns.yaml b/test/dryrun/context_vars/object_templated_ns/input_ns.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: mega-mart
+  labels:
+    box: big
+
diff --git a/test/dryrun/context_vars/object_unnamed_objdef/input.yaml b/test/dryrun/context_vars/object_unnamed_objdef/input.yaml
@@ -1,12 +1,5 @@
 ---
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: mega-mart
-  labels:
-    box: big
----
-apiVersion: v1
 kind: ConfigMap
 metadata:
   name: inventory
diff --git a/test/dryrun/context_vars/object_unnamed_objdef/input_ns.yaml b/test/dryrun/context_vars/object_unnamed_objdef/input_ns.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: mega-mart
+  labels:
+    box: big
+
diff --git a/test/dryrun/context_vars/objectname_nsselector/input.yaml b/test/dryrun/context_vars/objectname_nsselector/input.yaml
@@ -1,20 +1,5 @@
 ---
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: mega-mart
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mega-mart-2
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mega-mart-3
----
-apiVersion: v1
 kind: ConfigMap
 metadata:
   name: inventory
diff --git a/test/dryrun/context_vars/objectname_nsselector/input_ns.yaml b/test/dryrun/context_vars/objectname_nsselector/input_ns.yaml
@@ -0,0 +1,16 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: mega-mart
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: mega-mart-2
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: mega-mart-3
+
diff --git a/test/dryrun/context_vars/objectns_cluster_scoped/input_ns.yaml b/test/dryrun/context_vars/objectns_cluster_scoped/input_ns.yaml
diff --git a/test/dryrun/context_vars/objectns_templated_empty/input.yaml b/test/dryrun/context_vars/objectns_templated_empty/input.yaml
@@ -1,15 +1,5 @@
 ---
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: my-namespace
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: my-other-namespace
----
-apiVersion: v1
 kind: ConfigMap
 metadata:
   name: templated-ns-configmap
diff --git a/test/dryrun/context_vars/objectns_templated_empty/input_ns.yaml b/test/dryrun/context_vars/objectns_templated_empty/input_ns.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: my-namespace
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: my-other-namespace
+
diff --git a/test/dryrun/context_vars/objectns_templated_no_nsselector/input.yaml b/test/dryrun/context_vars/objectns_templated_no_nsselector/input.yaml
@@ -1,15 +1,5 @@
 ---
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: my-namespace
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: my-other-namespace
----
-apiVersion: v1
 kind: ConfigMap
 metadata:
   name: templated-ns-configmap
diff --git a/test/dryrun/context_vars/objectns_templated_no_nsselector/input_ns.yaml b/test/dryrun/context_vars/objectns_templated_no_nsselector/input_ns.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: my-namespace
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: my-other-namespace
+
diff --git a/test/dryrun/missing/missing_kind/input_ns_1.yaml b/test/dryrun/missing/missing_kind/input_ns_1.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: n1
+spec: {}
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: n2
+spec: {}
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: n3
+spec: {}
diff --git a/test/dryrun/missing/missing_kind_name/input_ns_1.yaml b/test/dryrun/missing/missing_kind_name/input_ns_1.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: n1
+spec: {}
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: n2
+spec: {}
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: n3
+spec: {}
diff --git a/test/e2e/case46_dryrun_cli_test.go b/test/e2e/case46_dryrun_cli_test.go
