Fix SB test race (#3373)

Co-authored-by: Bevan Arps <bevan.arps@microsoft.com>
Azure · Oct 4, 2023 · 7303e13 · 7303e13
1 parent fa59534
commit 7303e13
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 7 deletions.
diff --git a/v2/internal/controllers/crd_servicebus_namespace_basic_v1api20210101preview_test.go b/v2/internal/controllers/crd_servicebus_namespace_basic_v1api20210101preview_test.go
@@ -38,6 +38,10 @@ func Test_ServiceBus_Namespace_Basic_v1api20210101preview_CRUD(t *testing.T) {
 				ServiceBus_Queue_v1api20210101preview_CRUD(tc, namespace)
 			},
 		},
+	)
+
+	// This must run at the end as it modifies the namespace
+	tc.RunSubtests(
 		testcommon.Subtest{
 			Name: "Namespace secrets",
 			Test: func(tc *testcommon.KubePerTestContext) {

diff --git a/v2/internal/controllers/crd_servicebus_namespace_basic_v1api20211101_test.go b/v2/internal/controllers/crd_servicebus_namespace_basic_v1api20211101_test.go
@@ -38,9 +38,15 @@ func Test_ServiceBus_Namespace_Basic_v1api20211101_CRUD(t *testing.T) {
 				ServiceBus_Queue_v1api20211101_CRUD(tc, namespace)
 			},
 		},
+	)
+
+	// This must run at the end as it modifies the namespace
+	tc.RunSubtests(
 		testcommon.Subtest{
 			Name: "Namespace secrets",
-			Test: func(tc *testcommon.KubePerTestContext) { ServiceBus_Namespace_Secrets_v1api20211101(tc, namespace) },
+			Test: func(tc *testcommon.KubePerTestContext) {
+				ServiceBus_Namespace_Secrets_v1api20211101(tc, namespace)
+			},
 		},
 	)
 

diff --git a/v2/internal/controllers/crd_servicebus_namespace_basic_v1api20221001preview_test.go b/v2/internal/controllers/crd_servicebus_namespace_basic_v1api20221001preview_test.go
@@ -38,13 +38,16 @@ func Test_ServiceBus_Namespace_Basic_v1api20221001preview_CRUD(t *testing.T) {
 				ServiceBus_NamespacesQueue_v1api20221001preview_CRUD(tc, namespace)
 			},
 		},
+	)
+
+	// This must run at the end as it modifies the namespace
+	tc.RunSubtests(
 		testcommon.Subtest{
 			Name: "Namespace secrets",
 			Test: func(tc *testcommon.KubePerTestContext) {
 				ServiceBus_Namespace_Secrets_v1api20221001preview(tc, namespace)
 			},
-		},
-	)
+		})
 
 	tc.DeleteResourceAndWait(namespace)
 

diff --git a/v2/internal/controllers/crd_servicebus_namespace_standard_v1api20210101preview_test.go b/v2/internal/controllers/crd_servicebus_namespace_standard_v1api20210101preview_test.go
@@ -51,13 +51,16 @@ func Test_ServiceBus_Namespace_Standard_v1api20210101preview_CRUD(t *testing.T)
 				ServiceBus_NamespacesAuthorizationRule_v1api20210101preview_CRUD(tc, namespace)
 			},
 		},
+	)
+
+	// This must run at the end as it modifies the namespace
+	tc.RunSubtests(
 		testcommon.Subtest{
 			Name: "NamespaceSecrets CRUD",
 			Test: func(tc *testcommon.KubePerTestContext) {
 				ServiceBus_Namespace_Secrets_v1api20210101preview(tc, namespace)
 			},
-		},
-	)
+		})
 
 	tc.DeleteResourceAndWait(namespace)
 

diff --git a/v2/internal/controllers/crd_servicebus_namespace_standard_v1api20211101_test.go b/v2/internal/controllers/crd_servicebus_namespace_standard_v1api20211101_test.go
@@ -51,6 +51,10 @@ func Test_ServiceBus_Namespace_Standard_v1api20211101_CRUD(t *testing.T) {
 				ServiceBus_NamespacesAuthorizationRule_v1api20211101_CRUD(tc, namespace)
 			},
 		},
+	)
+
+	// This must run at the end as it modifies the namespace
+	tc.RunSubtests(
 		testcommon.Subtest{
 			Name: "NamespaceSecrets CRUD",
 			Test: func(tc *testcommon.KubePerTestContext) {

diff --git a/v2/internal/controllers/crd_servicebus_namespace_standard_v1api20221001preview_test.go b/v2/internal/controllers/crd_servicebus_namespace_standard_v1api20221001preview_test.go
@@ -51,13 +51,16 @@ func Test_ServiceBus_Namespace_Standard_v1api20221001preview_CRUD(t *testing.T)
 				ServiceBus_AuthorizationRule_v1api20221001preview_CRUD(tc, namespace)
 			},
 		},
+	)
+
+	// This must run at the end as it modifies the namespace.
+	tc.RunSubtests(
 		testcommon.Subtest{
 			Name: "NamespaceSecrets CRUD",
 			Test: func(tc *testcommon.KubePerTestContext) {
 				ServiceBus_Namespace_Secrets_v1api20221001preview(tc, namespace)
 			},
-		},
-	)
+		})
 
 	tc.DeleteResourceAndWait(namespace)