Merge pull request #2 from mbarouski/master

jaspervanveghel · Jul 1, 2022 · 31b9820 · 31b9820
2 parents 68097cc + 70a00b5
commit 31b9820
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -19,4 +19,4 @@ stop-redis:
 	@docker-compose stop $(REDIS_CONTAINER)
 
 wait-healthy-cluster:
-	@./tests/fixtures/redis-cluster/wait-healthy-cluster.sh
+	@./tests/fixtures/redis-cluster/wait-healthy-cluster-in-container.sh
diff --git a/tests/fixtures/redis-cluster/wait-healthy-cluster-in-container.sh b/tests/fixtures/redis-cluster/wait-healthy-cluster-in-container.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cat ./tests/fixtures/redis-cluster/wait-healthy-cluster.sh | docker exec -i $(docker ps | grep redis-cluster | grep -oE "^[0-9a-z]+") /bin/sh
diff --git a/tests/fixtures/redis-cluster/wait-healthy-cluster.sh b/tests/fixtures/redis-cluster/wait-healthy-cluster.sh
@@ -12,7 +12,7 @@ for port in 6390 6391 6392; do
     cluster_slots_assigned=$(echo "$cluster_info" | grep "cluster_slots_assigned:" | grep -oE '[0-9]+')
     cluster_slots_ok=$(echo "$cluster_info" | grep "cluster_slots_ok:" | grep -oE '[0-9]+')
 
-    if [ "$cluster_state" == "ok" ] && [ "$cluster_size" == "3" ] && [ "$cluster_slots_assigned" == "$cluster_slots_ok" ]; then
+    if [ "$cluster_state" = "ok" ] && [ "$cluster_size" = "3" ] && [ "$cluster_slots_assigned" = "$cluster_slots_ok" ]; then
       break
     fi
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/sh

		cat ./tests/fixtures/redis-cluster/wait-healthy-cluster.sh \| docker exec -i $(docker ps \| grep redis-cluster \| grep -oE "^[0-9a-z]+") /bin/sh