fix tests

redis · May 6, 2024 · 3b09eee · 3b09eee
1 parent dc28a4f
commit 3b09eee
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/tests/test_asyncio/test_monitor.py b/tests/test_asyncio/test_monitor.py
@@ -59,6 +59,6 @@ async def test_lua_script(self, r):
     async def test_lua_script_in_enterprise(self, r):
         async with r.monitor() as m:
             script = 'return redis.call("GET", "foo")'
-            assert await r.eval(script, 0) is None
+            assert await r.eval(script, 1, "foo") is None
             response = await wait_for_command(r, m, "GET foo")
             assert response is None
diff --git a/tests/test_asyncio/test_sentinel.py b/tests/test_asyncio/test_sentinel.py
@@ -11,6 +11,7 @@
     SentinelConnectionPool,
     SlaveNotFoundError,
 )
+from tests.conftest import skip_if_redis_enterprise
 
 
 @pytest_asyncio.fixture(scope="module")
@@ -182,6 +183,7 @@ async def test_discover_slaves(cluster, sentinel):
 
 
 @pytest.mark.onlynoncluster
+@skip_if_redis_enterprise()
 async def test_master_for(cluster, sentinel, master_ip):
     async with sentinel.master_for("mymaster", db=9) as master:
         assert await master.ping()
@@ -193,6 +195,7 @@ async def test_master_for(cluster, sentinel, master_ip):
 
 
 @pytest.mark.onlynoncluster
+@skip_if_redis_enterprise()
 async def test_slave_for(cluster, sentinel):
     cluster.slaves = [
         {"ip": "127.0.0.1", "port": 6379, "is_odown": False, "is_sdown": False}

diff --git a/tests/test_monitor.py b/tests/test_monitor.py
@@ -62,6 +62,6 @@ def test_lua_script(self, r):
     def test_lua_script_in_enterprise(self, r):
         with r.monitor() as m:
             script = 'return redis.call("GET", "foo")'
-            assert r.eval(script, 0) is None
+            assert r.eval(script, 1, "foo") is None
             response = wait_for_command(r, m, "GET foo")
             assert response is None
diff --git a/tests/test_sentinel.py b/tests/test_sentinel.py
@@ -10,6 +10,7 @@
     SentinelConnectionPool,
     SlaveNotFoundError,
 )
+from tests.conftest import skip_if_redis_enterprise
 
 
 @pytest.fixture(scope="module")
@@ -99,6 +100,7 @@ def test_discover_master_error(sentinel):
 
 
 @pytest.mark.onlynoncluster
+@skip_if_redis_enterprise()
 def test_dead_pool(sentinel):
     master = sentinel.master_for("mymaster", db=9)
     conn = master.connection_pool.get_connection("_")
@@ -184,6 +186,7 @@ def test_discover_slaves(cluster, sentinel):
 
 
 @pytest.mark.onlynoncluster
+@skip_if_redis_enterprise()
 def test_master_for(cluster, sentinel, master_ip):
     master = sentinel.master_for("mymaster", db=9)
     assert master.ping()
@@ -195,6 +198,7 @@ def test_master_for(cluster, sentinel, master_ip):
 
 
 @pytest.mark.onlynoncluster
+@skip_if_redis_enterprise()
 def test_slave_for(cluster, sentinel):
     cluster.slaves = [
         {"ip": "127.0.0.1", "port": 6379, "is_odown": False, "is_sdown": False}

diff --git a/tests/test_ssl.py b/tests/test_ssl.py
@@ -6,11 +6,16 @@
 import redis
 from redis.exceptions import ConnectionError, RedisError
 
-from .conftest import skip_if_cryptography, skip_if_nocryptography
+from .conftest import (
+    skip_if_cryptography,
+    skip_if_nocryptography,
+    skip_if_redis_enterprise,
+)
 from .ssl_utils import get_ssl_filename
 
 
 @pytest.mark.ssl
+@skip_if_redis_enterprise()
 class TestSSL:
     """Tests for SSL connections