Add cleanup to creation tests to avoid race conditions and test interference.

Author: MirahImage

controllers/binding_controller_test.go

@@ -95,6 +95,10 @@ var _ = Describe("bindingController", func() {
 	})
 
 	When("creating a binding", func() {
+		AfterEach(func() {
+			Expect(k8sClient.Delete(ctx, &binding)).To(Succeed())
+		})
+
 		When("the RabbitMQ Client returns a HTTP error response", func() {
 			BeforeEach(func() {
 				bindingName = "test-binding-http-error"

controllers/exchange_controller_test.go

@@ -97,6 +97,10 @@ var _ = Describe("exchange-controller", func() {
 	})
 
 	Context("creation", func() {
+		AfterEach(func() {
+			Expect(k8sClient.Delete(ctx, &exchange)).To(Succeed())
+		})
+
 		When("the RabbitMQ Client returns a HTTP error response", func() {
 			BeforeEach(func() {
 				exchangeName = "test-http-error"
@@ -150,6 +154,7 @@ var _ = Describe("exchange-controller", func() {
 			})
 		})
 	})
+
 	Context("LastTransitionTime", func() {
 		BeforeEach(func() {
 			exchangeName = "test-last-transition-time"
@@ -158,6 +163,11 @@ var _ = Describe("exchange-controller", func() {
 				StatusCode: http.StatusCreated,
 			}, nil)
 		})
+
+		AfterEach(func() {
+			Expect(k8sClient.Delete(ctx, &exchange)).To(Succeed())
+		})
+
 		It("changes only if status changes", func() {
 			By("setting LastTransitionTime when transitioning to status Ready=true")
 			Expect(k8sClient.Create(ctx, &exchange)).To(Succeed())

controllers/federation_controller_test.go

@@ -98,6 +98,10 @@ var _ = Describe("federation-controller", func() {
 	})
 
 	When("creation", func() {
+		AfterEach(func() {
+			Expect(k8sClient.Delete(ctx, &federation)).To(Succeed())
+		})
+
 		When("the RabbitMQ Client returns a HTTP error response", func() {
 			BeforeEach(func() {
 				federationName = "test-federation-http-error"

controllers/operatorpolicy_controller_test.go

@@ -101,6 +101,10 @@ var _ = Describe("operatorpolicy-controller", func() {
 	})
 
 	Context("creation", func() {
+		AfterEach(func() {
+			Expect(k8sClient.Delete(ctx, &policy)).To(Succeed())
+		})
+
 		When("the RabbitMQ Client returns a HTTP error response", func() {
 			BeforeEach(func() {
 				policyName = "test-http-error"

controllers/permission_controller_test.go

@@ -101,6 +101,10 @@ var _ = Describe("permission-controller", func() {
 		})
 
 		Context("creation", func() {
+			AfterEach(func() {
+				Expect(k8sClient.Delete(ctx, &permission)).To(Succeed())
+			})
+
 			When("the RabbitMQ Client returns a HTTP error response", func() {
 				BeforeEach(func() {
 					permissionName = "test-with-username-http-error"
@@ -272,6 +276,10 @@ var _ = Describe("permission-controller", func() {
 		})
 
 		Context("creation", func() {
+			AfterEach(func() {
+				Expect(k8sClient.Delete(ctx, &permission)).To(Succeed())
+			})
+
 			When("user not exist", func() {
 				BeforeEach(func() {
 					permissionName = "test-with-userref-create-not-exist"
@@ -415,12 +423,16 @@ var _ = Describe("permission-controller", func() {
 			})
 		})
 
-		Context("ownerref", func() {
+		When("the user already exists", func() {
 			BeforeEach(func() {
 				permissionName = "ownerref-with-userref-test"
 				userName = "example-ownerref"
 			})
 
+			AfterEach(func() {
+				Expect(k8sClient.Delete(ctx, &user)).To(Succeed())
+			})
+
 			It("sets the correct deletion ownerref to the object", func() {
 				Expect(k8sClient.Create(ctx, &user)).To(Succeed())
 				user.Status.Username = userName

controllers/policy_controller_test.go

@@ -100,6 +100,10 @@ var _ = Describe("policy-controller", func() {
 	})
 
 	Context("creation", func() {
+		AfterEach(func() {
+			Expect(k8sClient.Delete(ctx, &policy)).To(Succeed())
+		})
+
 		When("the RabbitMQ Client returns a HTTP error response", func() {
 			BeforeEach(func() {
 				policyName = "test-http-error"

controllers/queue_controller_test.go

@@ -96,6 +96,10 @@ var _ = Describe("queue-controller", func() {
 	})
 
 	Context("creation", func() {
+		AfterEach(func() {
+			Expect(k8sClient.Delete(ctx, &queue)).To(Succeed())
+		})
+
 		When("the RabbitMQ Client returns a HTTP error response", func() {
 			BeforeEach(func() {
 				queueName = "test-http-error"

controllers/schemareplication_controller_test.go

@@ -103,6 +103,10 @@ var _ = Describe("schema-replication-controller", func() {
 	})
 
 	When("creation", func() {
+		AfterEach(func() {
+			Expect(k8sClient.Delete(ctx, &replication)).To(Succeed())
+		})
+
 		When("the RabbitMQ Client returns a HTTP error response", func() {
 			BeforeEach(func() {
 				replicationName = "test-replication-http-error"
@@ -257,6 +261,7 @@ var _ = Describe("schema-replication-controller", func() {
 		})
 
 		AfterEach(func() {
+			Expect(k8sClient.Delete(ctx, &replication)).To(Succeed())
 			rabbitmqclient.SecretStoreClientProvider = rabbitmqclient.GetSecretStoreClient
 		})
 

controllers/shovel_controller_test.go

@@ -100,6 +100,10 @@ var _ = Describe("shovel-controller", func() {
 	})
 
 	When("creation", func() {
+		AfterEach(func() {
+			Expect(k8sClient.Delete(ctx, &shovel)).To(Succeed())
+		})
+
 		When("the RabbitMQ Client returns a HTTP error response", func() {
 			BeforeEach(func() {
 				shovelName = "test-shovel-http-error"

controllers/super_stream_controller_test.go

@@ -124,6 +124,10 @@ var _ = Describe("super-stream-controller", func() {
 		})
 
 		Context("creation", func() {
+			AfterEach(func() {
+				Expect(k8sClient.Delete(ctx, &superStream)).To(Succeed())
+			})
+
 			When("an underlying resource is deleted", func() {
 				JustBeforeEach(func() {
 					Expect(k8sClient.Create(ctx, &superStream)).To(Succeed())