mix of makefile and action

Author: ndyakov

.github/actions/run-tests/action.yml

@@ -47,6 +47,5 @@ runs:
         RCE_DOCKER: "true"
         RE_CLUSTER: "false"
       run: |
-        go test ./... -short -race && \
-        go test -coverprofile=coverage.txt -covermode=atomic ./... && \
+        make test.ci
       shell: bash

Makefile

@@ -9,6 +9,12 @@ redisstackdocker.stop:
 
 test: testdeps
 	$(MAKE) redisstackdocker.start
+	$(MAKE) test.ci
+	$(MAKE) redisstackdocker.stop
+
+testdeps: testdata/redis/src/redis-server
+
+test.ci:
 	$(eval GO_VERSION := $(shell go version | cut -d " " -f 3 | cut -d. -f2))
 	set -e; for dir in $(GO_MOD_DIRS); do \
 	  if echo "$${dir}" | grep -q "./example" && [ "$(GO_VERSION)" = "19" ]; then \
@@ -26,9 +32,6 @@ test: testdeps
 	done
 	cd internal/customvet && go build .
 	go vet -vettool ./internal/customvet/customvet
-	$(MAKE) redisstackdocker.stop
-
-testdeps: testdata/redis/src/redis-server
 
 bench:
 	go test ./... -test.run=NONE -test.bench=. -test.benchmem

docker-compose.yml

@@ -82,6 +82,24 @@ services:
       - all-stack
       - all
 
+  sentinel-cluster:
+    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
+    container_name: redis-sentinel-cluster
+    environment:
+      - NODES=3
+      - TLS_ENABLED=yes
+      - REDIS_CLUSTER=no
+      - PORT=9121
+    command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --tls-auth-clients optional --save ""}
+    ports:
+      - "9121-9123:9121-9123"
+    volumes:
+      - "./dockers/sentinel-cluster:/redis/work"
+    profiles:
+      - sentinel
+      - all-stack
+      - all
+
   redisRing1:
     image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
     container_name: redis-ring-1

main_test.go

@@ -28,12 +28,12 @@ const (
 
 const (
 	sentinelName       = "go-redis-test"
-	sentinelMasterPort = "9123"
-	sentinelSlave1Port = "9124"
-	sentinelSlave2Port = "9125"
-	sentinelPort1      = "9126"
-	sentinelPort2      = "9127"
-	sentinelPort3      = "9128"
+	sentinelMasterPort = "9121"
+	sentinelSlave1Port = "9122"
+	sentinelSlave2Port = "9123"
+	sentinelPort1      = "26379"
+	sentinelPort2      = "26380"
+	sentinelPort3      = "26381"
 )
 
 var (