Merge pull request #121 from rabbitmq/system-tests

Fit system test matching error strings
rabbitmq · Apr 28, 2021 · 5bce12e · 5bce12e
2 parents 383c578 + 8a69cd7
commit 5bce12e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/system_tests/deletion_system_test.go b/system_tests/deletion_system_test.go
@@ -100,7 +100,7 @@ var _ = Describe("Deletion", func() {
 				targetCluster.Name,
 			)
 			return string(output)
-		}, 90, 10).Should(ContainSubstring("not found"))
+		}, 90, 10).Should(ContainSubstring("NotFound"))
 		By("allowing the topology objects to be deleted")
 		Expect(k8sClient.Delete(ctx, &exchange)).To(Succeed())
 		Eventually(func() string {
@@ -112,7 +112,7 @@ var _ = Describe("Deletion", func() {
 				exchange.Name,
 			)
 			return string(output)
-		}, 30, 10).Should(ContainSubstring("not found"))
+		}, 30, 10).Should(ContainSubstring("NotFound"))
 		Expect(k8sClient.Delete(ctx, &policy)).To(Succeed())
 		Eventually(func() string {
 			output, _ := kubectl(
@@ -123,7 +123,7 @@ var _ = Describe("Deletion", func() {
 				policy.Name,
 			)
 			return string(output)
-		}, 30, 10).Should(ContainSubstring("not found"))
+		}, 30, 10).Should(ContainSubstring("NotFound"))
 		Expect(k8sClient.Delete(ctx, &queue)).To(Succeed())
 		Eventually(func() string {
 			output, _ := kubectl(
@@ -134,7 +134,7 @@ var _ = Describe("Deletion", func() {
 				queue.Name,
 			)
 			return string(output)
-		}, 30, 10).Should(ContainSubstring("not found"))
+		}, 30, 10).Should(ContainSubstring("NotFound"))
 		Expect(k8sClient.Delete(ctx, &user)).To(Succeed())
 		Eventually(func() string {
 			output, _ := kubectl(
@@ -145,7 +145,7 @@ var _ = Describe("Deletion", func() {
 				user.Name,
 			)
 			return string(output)
-		}, 30, 10).Should(ContainSubstring("not found"))
+		}, 30, 10).Should(ContainSubstring("NotFound"))
 		Expect(k8sClient.Delete(ctx, &vhost)).To(Succeed())
 		Eventually(func() string {
 			output, _ := kubectl(
@@ -156,6 +156,6 @@ var _ = Describe("Deletion", func() {
 				vhost.Name,
 			)
 			return string(output)
-		}, 30, 10).Should(ContainSubstring("not found"))
+		}, 30, 10).Should(ContainSubstring("NotFound"))
 	})
 })
diff --git a/system_tests/tls_system_test.go b/system_tests/tls_system_test.go
@@ -62,7 +62,7 @@ var _ = Describe("RabbitmqCluster with TLS", func() {
 				policy.Name,
 			)
 			return string(output)
-		}, 90, 10).Should(ContainSubstring("not found"))
+		}, 90, 10).Should(ContainSubstring("NotFound"))
 		Expect(k8sClient.Delete(ctx, &rabbitmqv1beta1.RabbitmqCluster{ObjectMeta: metav1.ObjectMeta{Name: targetCluster.Name, Namespace: targetCluster.Namespace}})).To(Succeed())
 		Eventually(func() string {
 			output, _ := kubectl(
@@ -73,7 +73,7 @@ var _ = Describe("RabbitmqCluster with TLS", func() {
 				targetCluster.Name,
 			)
 			return string(output)
-		}, 90, 10).Should(ContainSubstring("not found"))
+		}, 90, 10).Should(ContainSubstring("NotFound"))
 	})
 
 	It("succeeds creating objects on the TLS-enabled instance", func() {

diff --git a/system_tests/utils.go b/system_tests/utils.go
@@ -192,7 +192,7 @@ func setupTestRabbitmqCluster(k8sClient client.Client, rabbitmqCluster *rabbitmq
 			"-ojsonpath='{.status.conditions[?(@.type==\"AllReplicasReady\")].status}'",
 		)
 		if err != nil {
-			Expect(string(output)).To(ContainSubstring("not found"))
+			Expect(string(output)).To(ContainSubstring("NotFound"))
 		}
 		return string(output)
 	}, 120, 10).Should(Equal("'True'"))
@@ -212,7 +212,7 @@ func updateTestRabbitmqCluster(k8sClient client.Client, rabbitmqCluster *rabbitm
 			"-ojsonpath='{.status.conditions[?(@.type==\"AllReplicasReady\")].status}'",
 		)
 		if err != nil {
-			Expect(string(output)).To(ContainSubstring("not found"))
+			Expect(string(output)).To(ContainSubstring("NotFound"))
 		}
 		return string(output)
 	}, 120, 10).Should(Equal("'True'"))
@@ -270,7 +270,7 @@ func k8sSecretExists(secretName, secretNamespace string) (bool, error) {
 	)
 
 	if err != nil {
-		ExpectWithOffset(1, string(output)).To(ContainSubstring("not found"))
+		ExpectWithOffset(1, string(output)).To(ContainSubstring("NotFound"))
 		return false, nil
 	}