test validation and skips

Author: chayim

tests/conftest.py

@@ -100,8 +100,14 @@ def skip_ifmodversion_lt(min_version: str, module_name: str):
 
 
 def skip_if_redis_enterprise(func):
-    return pytest.mark.skipif(REDIS_INFO["enterprise"] == True,
-                                reason="Redis enterprise")
+    check = REDIS_INFO["enterprise"] is True
+    return pytest.mark.skipif(check, reason="Redis enterprise"
+                              )
+
+
+def skip_ifnot_redis_enterprise(func):
+    check = REDIS_INFO["enterprise"] is False
+    return pytest.mark.skipif(check, reason="Redis enterprise")
 
 
 def _get_client(cls, request, single_connection_client=True, flushdb=True,

tests/test_commands.py

@@ -327,7 +327,7 @@ def test_client_list_types_not_replica(self, r):
         for client_type in ['normal', 'master', 'pubsub']:
             clients = r.client_list(_type=client_type)
             assert isinstance(clients, list)
-            
+
     @skip_if_redis_enterprise
     def test_client_list_replica(self, r):
         clients = r.client_list(_type='replica')
@@ -528,17 +528,12 @@ def test_config_resetstat(self, r):
         reset_commands_processed = int(r.info()['total_commands_processed'])
         assert reset_commands_processed < prior_commands_processed
 
+    @skip_if_redis_enterprise
     def test_config_set(self, r):
-        # data = r.config_get()
-        # rdbname = data['dbfilename']
-        # try:
-        #     assert r.config_set('dbfilename', 'redis_py_test.rdb')
-        #     assert r.config_get()['dbfilename'] == 'redis_py_test.rdb'
-        # finally:
-        #     assert r.config_set('dbfilename', rdbname)
-        assert r.config_set('list-max-ziplist-entriies', 1000)
-        assert r.config_get('list-max-ziplist-entries') == 1000
-        r.config_set('list-max-ziplist-entriies', 0)
+        r.config_set('timeout', 70)
+        assert r.config_get()['timeout'] == '70'
+        assert r.config_set('timeout', 0)
+        assert r.config_get()['timeout'] == '0'
 
     def test_dbsize(self, r):
         r['a'] = 'foo'

tests/test_connection_pool.py

@@ -8,7 +8,7 @@
 from threading import Thread
 from redis.connection import ssl_available, to_bool
 from .conftest import (
-    skip_if_server_version_lt, 
+    skip_if_server_version_lt,
     skip_if_redis_enterprise,
     _get_client
 )

tests/test_monitor.py

@@ -1,4 +1,8 @@
-from .conftest import wait_for_command
+from .conftest import (
+    skip_if_redis_enterprise,
+    skip_ifnot_redis_enterprise,
+    wait_for_command
+)
 
 
 class TestMonitor:
@@ -40,6 +44,7 @@ def test_command_with_escaped_data(self, r):
             response = wait_for_command(r, m, 'GET foo\\\\x92')
             assert response['command'] == 'GET foo\\\\x92'
 
+    @skip_if_redis_enterprise
     def test_lua_script(self, r):
         with r.monitor() as m:
             script = 'return redis.call("GET", "foo")'
@@ -49,3 +54,11 @@ def test_lua_script(self, r):
             assert response['client_type'] == 'lua'
             assert response['client_address'] == 'lua'
             assert response['client_port'] == ''
+
+    @skip_ifnot_redis_enterprise
+    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
+            response = wait_for_command(r, m, 'GET foo')
+            assert response is None

tests/test_pubsub.py

@@ -7,7 +7,11 @@
 import redis
 from redis.exceptions import ConnectionError
 
-from .conftest import _get_client, skip_if_server_version_lt
+from .conftest import (
+    _get_client,
+    skip_if_redis_enterprise,
+    skip_if_server_version_lt
+)
 
 
 def wait_for_message(pubsub, timeout=0.1, ignore_subscribe_messages=False):
@@ -528,6 +532,7 @@ def test_send_pubsub_ping_message(self, r):
 class TestPubSubConnectionKilled:
 
     @skip_if_server_version_lt('3.0.0')
+    @skip_if_redis_enterprise
     def test_connection_error_raised_when_connection_dies(self, r):
         p = r.pubsub()
         p.subscribe('foo')

tests/test_scripting.py

@@ -2,6 +2,8 @@
 
 from redis import exceptions
 
+from tests.conftest import skip_if_server_version_lt
+
 
 multiply_script = """
 local value = redis.call('GET', KEYS[1])
@@ -30,7 +32,8 @@ def test_eval(self, r):
         # 2 * 3 == 6
         assert r.eval(multiply_script, 1, 'a', 3) == 6
 
-    def test_script_flush(self, r):
+    @skip_if_server_version_lt('6.2.0')
+    def test_script_flush_620(self, r):
         r.set('a', 2)
         r.script_load(multiply_script)
         r.script_flush('ASYNC')
@@ -43,6 +46,12 @@ def test_script_flush(self, r):
         r.script_load(multiply_script)
         r.script_flush()
 
+        with pytest.raises(exceptions.DataError):
+            r.set('a', 2)
+            r.script_load(multiply_script)
+            r.script_flush("NOTREAL")
+
+    def test_script_flush(self, r):
         r.set('a', 2)
         r.script_load(multiply_script)
         r.script_flush(None)