Remove unnecessary checks in system tests

- waitForClusterAvailable will always be true after ensuring
AllReplicasRunning from waitForRabbtmqRunning

Author: ChunyiLyu

system_tests/system_tests.go

@@ -52,9 +52,7 @@ var _ = Describe("Operator", func() {
 				Limits:   map[corev1.ResourceName]k8sresource.Quantity{},
 			}
 			Expect(createRabbitmqCluster(ctx, rmqClusterClient, cluster)).To(Succeed())
-
 			waitForRabbitmqRunning(cluster)
-			waitForClusterAvailable(cluster)
 
 			hostname = kubernetesNodeIp(ctx, clientSet)
 			port = rabbitmqNodePort(ctx, clientSet, cluster, "management")
@@ -342,7 +340,6 @@ CONSOLE_LOG=new`
 				}
 				Expect(createRabbitmqCluster(ctx, rmqClusterClient, cluster)).To(Succeed())
 				waitForRabbitmqRunning(cluster)
-				waitForClusterAvailable(cluster)
 
 				// Passing a single hostname for certificate creation works because
 				// the AMPQS client is connecting using the same hostname
@@ -412,7 +409,6 @@ CONSOLE_LOG=new`
 			}
 			Expect(createRabbitmqCluster(ctx, rmqClusterClient, cluster)).To(Succeed())
 			waitForRabbitmqRunning(cluster)
-			waitForClusterAvailable(cluster)
 
 			hostname = kubernetesNodeIp(ctx, clientSet)
 			var err error

system_tests/utils.go

@@ -151,7 +151,7 @@ func getMessageFromQueue(rabbitmqHostName, rabbitmqPort, rabbitmqUsername, rabbi
 		return nil, err
 	}
 
-	messages := []Message{}
+	var messages []Message
 	err = json.Unmarshal(response, &messages)
 	if err != nil {
 		return nil, err
@@ -458,7 +458,7 @@ func rabbitmqNodePort(ctx context.Context, clientSet *kubernetes.Clientset, clus
 
 func waitForTLSUpdate(cluster *rabbitmqv1beta1.RabbitmqCluster) {
 	waitForRabbitmqNotRunningWithOffset(cluster, 2)
-	waitForClusterAvailable(cluster)
+	waitForRabbitmqRunning(cluster)
 }
 
 func waitForRabbitmqUpdate(cluster *rabbitmqv1beta1.RabbitmqCluster) {
@@ -470,33 +470,6 @@ func waitForRabbitmqRunning(cluster *rabbitmqv1beta1.RabbitmqCluster) {
 	waitForRabbitmqRunningWithOffset(cluster, 2)
 }
 
-func waitForClusterAvailable(cluster *rabbitmqv1beta1.RabbitmqCluster) {
-	waitForClusterAvailableWithOffset(cluster, 2)
-}
-
-func waitForClusterAvailableWithOffset(cluster *rabbitmqv1beta1.RabbitmqCluster, callStackOffset int) {
-	var err error
-
-	EventuallyWithOffset(callStackOffset, func() string {
-		output, err := kubectl(
-			"-n",
-			cluster.Namespace,
-			"get",
-			"rabbitmqclusters",
-			cluster.Name,
-			"-ojsonpath='{.status.conditions[?(@.type==\"ClusterAvailable\")].status}'",
-		)
-
-		if err != nil {
-			Expect(string(output)).To(ContainSubstring("not found"))
-		}
-
-		return string(output)
-	}, podCreationTimeout, 1).Should(Equal("'True'"))
-
-	ExpectWithOffset(callStackOffset, err).NotTo(HaveOccurred())
-}
-
 func waitForRabbitmqNotRunningWithOffset(cluster *rabbitmqv1beta1.RabbitmqCluster, callStackOffset int) {
 	var err error