Test updates for sentinel 7.0

the bitnami image for sentinel 7.0 has a config error with a custom master name
alisaifee · Jun 6, 2022 · 042e2e9 · 042e2e9
1 parent b580201
commit 042e2e9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 20 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -46,7 +46,6 @@ services:
     image: 'bitnami/redis-sentinel:${LIMITS_REDIS_SENTINEL_SERVER_VERSION:-latest}'
     depends_on: [redis-sentinel-slave]
     environment:
-      - REDIS_MASTER_SET=localhost-redis-sentinel
       - REDIS_MASTER_HOST=${HOST_IP}
       - REDIS_MASTER_PORT_NUMBER=6380
     ports:
@@ -55,7 +54,6 @@ services:
     image: 'bitnami/redis-sentinel:${LIMITS_REDIS_SENTINEL_SERVER_VERSION:-latest}'
     depends_on: [redis-sentinel-slave-auth]
     environment:
-      - REDIS_MASTER_SET=localhost-redis-sentinel
       - REDIS_MASTER_HOST=${HOST_IP}
       - REDIS_MASTER_PASSWORD=sekret
       - REDIS_MASTER_PORT_NUMBER=6382

diff --git a/tests/aio/storage/test_redis.py b/tests/aio/storage/test_redis.py
@@ -152,7 +152,7 @@ class TestAsyncRedisSentinelStorage(AsyncSharedRedisTests):
     @pytest.fixture(autouse=True)
     def setup(self, redis_sentinel):
         self.storage_url = "redis+sentinel://localhost:26379"
-        self.service_name = "localhost-redis-sentinel"
+        self.service_name = "mymaster"
         self.storage = RedisSentinelStorage(
             f"async+{self.storage_url}", service_name=self.service_name
         )
@@ -211,7 +211,7 @@ async def test_auth_connect(
     ):
         storage_url = (
             f"async+redis+sentinel://{username}:{sentinel_password}@localhost:36379/"
-            "localhost-redis-sentinel"
+            "mymaster"
         )
         args = {}
         if password:

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -22,7 +22,7 @@ def check_sentinel_ready(host, port):
     try:
         return (
             redis.sentinel.Sentinel([(host, port)])
-            .master_for("localhost-redis-sentinel")
+            .master_for("mymaster")
             .ping()
         )
     except:  # noqa
@@ -37,7 +37,7 @@ def check_sentinel_auth_ready(host, port):
                 sentinel_kwargs={"password": "sekret"},
                 password="sekret",
             )
-            .master_for("localhost-redis-sentinel")
+            .master_for("mymaster")
             .ping()
         )
     except:  # noqa
@@ -229,14 +229,14 @@ def redis_cluster(redis_cluster_client):
 
 @pytest.fixture
 def redis_sentinel(redis_sentinel_client):
-    redis_sentinel_client.master_for("localhost-redis-sentinel").flushall()
+    redis_sentinel_client.master_for("mymaster").flushall()
 
     return redis_sentinel
 
 
 @pytest.fixture
 def redis_sentinel_auth(redis_sentinel_auth_client):
-    redis_sentinel_auth_client.master_for("localhost-redis-sentinel").flushall()
+    redis_sentinel_auth_client.master_for("mymaster").flushall()
 
     return redis_sentinel_auth_client
 

diff --git a/tests/storage/test_redis_sentinel.py b/tests/storage/test_redis_sentinel.py
@@ -11,7 +11,7 @@ class TestRedisSentinelStorage(SharedRedisTests):
     @pytest.fixture(autouse=True)
     def setup(self, redis_sentinel):
         self.storage_url = "redis+sentinel://localhost:26379"
-        self.service_name = "localhost-redis-sentinel"
+        self.service_name = "mymaster"
         self.storage = RedisSentinelStorage(
             self.storage_url, service_name=self.service_name
         )
@@ -59,7 +59,7 @@ def test_auth_connect(
         redis_sentinel_auth.master_for(self.service_name).flushall()
         storage_url = (
             f"redis+sentinel://{username}:{sentinel_password}@localhost:36379/"
-            "localhost-redis-sentinel"
+            "mymaster"
         )
         args = {}
         if password:

diff --git a/tests/test_storage.py b/tests/test_storage.py
@@ -65,20 +65,20 @@ class TestBaseStorage:
             ),
             pytest.param(
                 "redis+sentinel://localhost:26379",
-                {"service_name": "localhost-redis-sentinel"},
+                {"service_name": "mymaster"},
                 RedisSentinelStorage,
                 pytest.lazy_fixture("redis_sentinel"),
                 marks=pytest.mark.redis_sentinel,
             ),
             pytest.param(
-                "redis+sentinel://localhost:26379/localhost-redis-sentinel",
+                "redis+sentinel://localhost:26379/mymaster",
                 {},
                 RedisSentinelStorage,
                 pytest.lazy_fixture("redis_sentinel"),
                 marks=pytest.mark.redis_sentinel,
             ),
             pytest.param(
-                "redis+sentinel://:sekret@localhost:26379/localhost-redis-sentinel",
+                "redis+sentinel://:sekret@localhost:26379/mymaster",
                 {"password": "sekret"},
                 RedisSentinelStorage,
                 pytest.lazy_fixture("redis_sentinel_auth"),
@@ -152,18 +152,18 @@ def test_invalid_storage_string(self, uri, args):
             ),
             pytest.param(
                 "redis+sentinel://localhost:26379",
-                {"service_name": "localhost-redis-sentinel"},
+                {"service_name": "mymaster"},
                 pytest.lazy_fixture("redis_sentinel"),
                 marks=pytest.mark.redis_sentinel,
             ),
             pytest.param(
-                "redis+sentinel://localhost:26379/localhost-redis-sentinel",
+                "redis+sentinel://localhost:26379/mymaster",
                 {},
                 pytest.lazy_fixture("redis_sentinel"),
                 marks=pytest.mark.redis_sentinel,
             ),
             pytest.param(
-                "redis+sentinel://:sekret@localhost:36379/localhost-redis-sentinel",
+                "redis+sentinel://:sekret@localhost:36379/mymaster",
                 {"password": "sekret"},
                 pytest.lazy_fixture("redis_sentinel_auth"),
                 marks=pytest.mark.redis_sentinel,

diff --git a/tests/utils.py b/tests/utils.py
@@ -77,7 +77,7 @@ async def async_window(delay_end: float, delay: Optional[float] = None):
             marks=pytest.mark.redis_cluster,
         ),
         pytest.param(
-            "redis+sentinel://localhost:26379/localhost-redis-sentinel",
+            "redis+sentinel://localhost:26379/mymaster",
             {"use_replicas": False},
             pytest.lazy_fixture("redis_sentinel"),
             marks=pytest.mark.redis_sentinel,
@@ -108,7 +108,7 @@ async def async_window(delay_end: float, delay: Optional[float] = None):
             marks=pytest.mark.redis_cluster,
         ),
         pytest.param(
-            "redis+sentinel://localhost:26379/localhost-redis-sentinel",
+            "redis+sentinel://localhost:26379/mymaster",
             {"use_replicas": False},
             pytest.lazy_fixture("redis_sentinel"),
             marks=pytest.mark.redis_sentinel,
@@ -151,7 +151,7 @@ async def async_window(delay_end: float, delay: Optional[float] = None):
             marks=pytest.mark.redis_cluster,
         ),
         pytest.param(
-            "async+redis+sentinel://localhost:26379/localhost-redis-sentinel",
+            "async+redis+sentinel://localhost:26379/mymaster",
             {"use_replicas": False},
             pytest.lazy_fixture("redis_sentinel"),
             marks=pytest.mark.redis_sentinel,
@@ -182,7 +182,7 @@ async def async_window(delay_end: float, delay: Optional[float] = None):
             marks=pytest.mark.redis_cluster,
         ),
         pytest.param(
-            "async+redis+sentinel://localhost:26379/localhost-redis-sentinel",
+            "async+redis+sentinel://localhost:26379/mymaster",
             {"use_replicas": False},
             pytest.lazy_fixture("redis_sentinel"),
             marks=pytest.mark.redis_sentinel,