Merge pull request #980 from rabbitmq/fix-kubectl-plugin-tests

Update kubectl-bats tests

Author: Zerpet

.github/workflows/pr.yml

@@ -99,6 +99,4 @@ jobs:
         export PATH=$PATH:$GOPATH/bin
         make install-tools
         kind create cluster --image kindest/node:"$K8S_VERSION"
-        DOCKER_REGISTRY_SERVER=local-server OPERATOR_IMAGE=local-operator make deploy-kind
-        PATH=$PATH:$(pwd)/bin
-        kubectl-rabbitmq.bats
+        DOCKER_REGISTRY_SERVER=local-server OPERATOR_IMAGE=local-operator make deploy-kind kubectl-plugin-tests

Makefile

@@ -165,7 +165,7 @@ system-tests: install-tools ## Run end-to-end tests against Kubernetes cluster d
 
 kubectl-plugin-tests: ## Run kubectl-rabbitmq tests
 	echo "running kubectl plugin tests"
-	./bin/kubectl-rabbitmq.bats
+	PATH=$(PWD)/bin:$$PATH ./bin/kubectl-rabbitmq.bats
 
 tests: unit-tests integration-tests system-tests kubectl-plugin-tests
 

bin/kubectl-rabbitmq

@@ -226,7 +226,7 @@ manage() {
 }
 
 list_rabbitmq_clusters() {
-    kubectl get ${NAMESPACE} rabbitmqclusters
+    kubectl get ${NAMESPACE} rabbitmqclusters --sort-by='{.metadata.name}'
 }
 
 create() {

bin/kubectl-rabbitmq.bats

@@ -177,7 +177,7 @@ eventually() {
   kubectl rabbitmq debug bats-default
 
   # '[debug] <pid> Lager installed handler' is logged even without enabling debug logging
-  eventually "kubectl logs bats-default-server-0 | grep -v ' \[debug\] .* Lager installed handler ' | grep ' \[debug\] '" 30
+  eventually "kubectl logs bats-default-server-0 | grep -v ' \[dbug\] .* Lager installed handler ' | grep ' \[dbug\] '" 30
 }
 
 @test "delete deletes RabbitMQ cluster" {