fix up more tests, now only ssl stuff seems to remain. (4 tests)

Author: kiryazovi-redis

src/test/resources/docker-env/docker-compose.yml

@@ -35,8 +35,11 @@ services:
     container_name: redis-standalone-4
     volumes:
       - ./redis-standalone-4/config:/redis/config:r
+    environment:
+      - REDIS_CLUSTER=no
     ports:
       - "6484:6484"
+      - "26381:26381"
     networks:
       - redis-network
 
@@ -48,44 +51,14 @@ services:
     volumes:
       - ./redis-standalone-sentinel-controlled/config:/redis/config:r
     ports:
+      - "26380:26380"
+      - "26379:26379"
       - "6482:6482"
       - "6483:6483"
     networks:
       - redis-network
 
 
-
-  # Sentinel Nodes
-  sentinel-1:
-    image: redislabs/client-libs-test:8.0-M02
-    container_name: sentinel-1
-    volumes:
-      - ./sentinel-1/config:/redis/config:r
-    ports:
-      - "26379:26379"
-    networks:
-      - redis-network
-
-  sentinel-2:
-    image: redislabs/client-libs-test:8.0-M02
-    container_name: sentinel-2
-    volumes:
-      - ./sentinel-2/config:/redis/config:r
-    ports:
-      - "26380:26380"
-    networks:
-      - redis-network
-
-  sentinel-3:
-    image: redislabs/client-libs-test:8.0-M02
-    container_name: sentinel-3
-    volumes:
-      - ./sentinel-3/config:/redis/config:r
-    ports:
-      - "26381:26381"
-    networks:
-      - redis-network
-
   ssl-test-cluster:
     image: redislabs/client-libs-test:8.0-M02
     container_name: ssl-test-cluster

src/test/resources/docker-env/sentinel-3/config/node-sentinel-26381/redis.conf renamed to src/test/resources/docker-env/redis-standalone-4/config/node-sentinel-26381/redis.conf

@@ -1,11 +1,11 @@
 port 26381
-sentinel monitor mymaster localhost 6482 1
+sentinel monitor mymaster localhost 6484 1
 sentinel announce-hostnames yes
 sentinel resolve-hostnames yes
 sentinel announce-ip localhost
 sentinel down-after-milliseconds mymaster 200
 sentinel failover-timeout mymaster 200
 sentinel parallel-syncs mymaster 1
+sentinel auth-pass mymaster foobared
 unixsocket /work/socket-26381
-unixsocketperm 777
-requirepass foobared
+unixsocketperm 777