Python: Fix CI on redis 6 (valkey-io#2535)

* fix tests


Signed-off-by: Yury-Fridlyand <[email protected]>

Author: Yury-Fridlyand

python/pytest.ini

@@ -1,4 +1,5 @@
 [pytest]
 markers =
     smoke_test: mark a test as a build verification testing.
+    skip_if_version_below: parametrized mark for fast skipping tests by server version.
 addopts = -k "not server_modules and not pubsub"

python/python/tests/conftest.py

@@ -15,6 +15,7 @@
 from glide.logger import Level as logLevel
 from glide.logger import Logger
 from tests.utils.cluster import ValkeyCluster
+from tests.utils.utils import check_if_server_version_lt
 
 DEFAULT_HOST = "localhost"
 DEFAULT_PORT = 6379
@@ -278,3 +279,24 @@ async def test_teardown(request, cluster_mode: bool, protocol: ProtocolVersion):
     client = await create_client(request, cluster_mode, protocol=protocol, timeout=2000)
     await client.custom_command(["FLUSHALL"])
     await client.close()
+
+
+@pytest.fixture(autouse=True)
+async def skip_if_version_below(request):
+    """
+    Skip test(s) if server version is below than given parameter. Can skip a complete test suite.
+
+    Example:
+
+      @pytest.mark.skip_if_version_below('7.0.0')
+      async def test_meow_meow(...):
+          ...
+    """
+    if request.node.get_closest_marker("skip_if_version_below"):
+        min_version = request.node.get_closest_marker("skip_if_version_below").args[0]
+        client = await create_client(request, False)
+        if await check_if_server_version_lt(client, min_version):
+            pytest.skip(
+                reason=f"This feature added in version {min_version}",
+                allow_module_level=True,
+            )

python/python/tests/test_pubsub.py

@@ -469,6 +469,7 @@ async def test_pubsub_exact_happy_path_many_channels_co_existence(
             await client_cleanup(listening_client, pub_sub if cluster_mode else None)
             await client_cleanup(publishing_client, None)
 
+    @pytest.mark.skip_if_version_below("7.0.0")
     @pytest.mark.parametrize("cluster_mode", [True])
     @pytest.mark.parametrize(
         "method", [MethodTesting.Async, MethodTesting.Sync, MethodTesting.Callback]
@@ -506,9 +507,6 @@ async def test_sharded_pubsub(
             listening_client, publishing_client = await create_two_clients_with_pubsub(
                 request, cluster_mode, pub_sub
             )
-            min_version = "7.0.0"
-            if await check_if_server_version_lt(publishing_client, min_version):
-                pytest.skip(reason=f"Valkey version required >= {min_version}")
 
             assert (
                 await cast(GlideClusterClient, publishing_client).publish(
@@ -534,6 +532,7 @@ async def test_sharded_pubsub(
             await client_cleanup(listening_client, pub_sub if cluster_mode else None)
             await client_cleanup(publishing_client, None)
 
+    @pytest.mark.skip_if_version_below("7.0.0")
     @pytest.mark.parametrize("cluster_mode", [True])
     async def test_sharded_pubsub_co_existence(self, request, cluster_mode: bool):
         """
@@ -563,10 +562,6 @@ async def test_sharded_pubsub_co_existence(self, request, cluster_mode: bool):
                 request, cluster_mode, pub_sub
             )
 
-            min_version = "7.0.0"
-            if await check_if_server_version_lt(publishing_client, min_version):
-                pytest.skip(reason=f"Valkey version required >= {min_version}")
-
             assert (
                 await cast(GlideClusterClient, publishing_client).publish(
                     message, channel, sharded=True
@@ -608,6 +603,7 @@ async def test_sharded_pubsub_co_existence(self, request, cluster_mode: bool):
             await client_cleanup(listening_client, pub_sub if cluster_mode else None)
             await client_cleanup(publishing_client, None)
 
+    @pytest.mark.skip_if_version_below("7.0.0")
     @pytest.mark.parametrize("cluster_mode", [True])
     @pytest.mark.parametrize(
         "method", [MethodTesting.Async, MethodTesting.Sync, MethodTesting.Callback]
@@ -656,10 +652,6 @@ async def test_sharded_pubsub_many_channels(
                 request, cluster_mode, pub_sub
             )
 
-            min_version = "7.0.0"
-            if await check_if_server_version_lt(publishing_client, min_version):
-                pytest.skip(reason=f"Valkey version required >= {min_version}")
-
             # Publish messages to each channel
             for channel, message in channels_and_messages.items():
                 assert (
@@ -1172,6 +1164,7 @@ async def test_pubsub_combined_exact_and_pattern_multiple_clients(
             )
             await client_cleanup(client_dont_care, None)
 
+    @pytest.mark.skip_if_version_below("7.0.0")
     @pytest.mark.parametrize("cluster_mode", [True])
     @pytest.mark.parametrize(
         "method", [MethodTesting.Async, MethodTesting.Sync, MethodTesting.Callback]
@@ -1247,10 +1240,6 @@ async def test_pubsub_combined_exact_pattern_and_sharded_one_client(
                 pub_sub_exact,
             )
 
-            # Setup PUBSUB for sharded channels (Valkey version > 7)
-            if await check_if_server_version_lt(publishing_client, "7.0.0"):
-                pytest.skip("Valkey version required >= 7.0.0")
-
             # Publish messages to all channels
             for channel, message in {
                 **exact_channels_and_messages,
@@ -1308,6 +1297,7 @@ async def test_pubsub_combined_exact_pattern_and_sharded_one_client(
             )
             await client_cleanup(publishing_client, None)
 
+    @pytest.mark.skip_if_version_below("7.0.0")
     @pytest.mark.parametrize("cluster_mode", [True])
     @pytest.mark.parametrize(
         "method", [MethodTesting.Async, MethodTesting.Sync, MethodTesting.Callback]
@@ -1399,10 +1389,6 @@ async def test_pubsub_combined_exact_pattern_and_sharded_multi_client(
                 )
             )
 
-            # Setup PUBSUB for sharded channels (Valkey version > 7)
-            if await check_if_server_version_lt(publishing_client, "7.0.0"):
-                pytest.skip("Valkey version required >= 7.0.0")
-
             if method == MethodTesting.Callback:
                 context = callback_messages_pattern
 
@@ -1534,6 +1520,7 @@ async def test_pubsub_combined_exact_pattern_and_sharded_multi_client(
                 listening_client_sharded, pub_sub_sharded if cluster_mode else None
             )
 
+    @pytest.mark.skip_if_version_below("7.0.0")
     @pytest.mark.parametrize("cluster_mode", [True])
     @pytest.mark.parametrize(
         "method", [MethodTesting.Async, MethodTesting.Sync, MethodTesting.Callback]
@@ -1603,10 +1590,6 @@ async def test_pubsub_combined_different_channels_with_same_name(
                 )
             )
 
-            # (Valkey version > 7)
-            if await check_if_server_version_lt(publishing_client, "7.0.0"):
-                pytest.skip("Valkey version required >= 7.0.0")
-
             # Setup PUBSUB for pattern channel
             if method == MethodTesting.Callback:
                 context = callback_messages_pattern
@@ -1801,6 +1784,7 @@ async def test_pubsub_two_publishing_clients_same_name(
                 client_pattern, pub_sub_pattern if cluster_mode else None
             )
 
+    @pytest.mark.skip_if_version_below("7.0.0")
     @pytest.mark.parametrize("cluster_mode", [True])
     @pytest.mark.parametrize(
         "method", [MethodTesting.Async, MethodTesting.Sync, MethodTesting.Callback]
@@ -1892,9 +1876,6 @@ async def test_pubsub_three_publishing_clients_same_name_with_sharded(
             client_sharded, client_dont_care = await create_two_clients_with_pubsub(
                 request, cluster_mode, pub_sub_sharded
             )
-            # (Valkey version > 7)
-            if await check_if_server_version_lt(client_pattern, "7.0.0"):
-                pytest.skip("Valkey version required >= 7.0.0")
 
             # Publish messages to each channel - both clients publishing
             assert (
@@ -2024,6 +2005,7 @@ async def test_pubsub_exact_max_size_message(self, request, cluster_mode: bool):
             await client_cleanup(listening_client, pub_sub if cluster_mode else None)
             await client_cleanup(publishing_client, None)
 
+    @pytest.mark.skip_if_version_below("7.0.0")
     @pytest.mark.skip(
         reason="This test requires special configuration for client-output-buffer-limit for valkey-server and timeouts seems to vary across platforms and server versions"
     )
@@ -2062,10 +2044,6 @@ async def test_pubsub_sharded_max_size_message(self, request, cluster_mode: bool
                 timeout=10000,
             )
 
-            # (Valkey version > 7)
-            if await check_if_server_version_lt(publishing_client, "7.0.0"):
-                pytest.skip("Valkey version required >= 7.0.0")
-
             assert (
                 await cast(GlideClusterClient, publishing_client).publish(
                     message, channel, sharded=True
@@ -2161,6 +2139,7 @@ async def test_pubsub_exact_max_size_message_callback(
             await client_cleanup(listening_client, pub_sub if cluster_mode else None)
             await client_cleanup(publishing_client, None)
 
+    @pytest.mark.skip_if_version_below("7.0.0")
     @pytest.mark.skip(
         reason="This test requires special configuration for client-output-buffer-limit for valkey-server and timeouts seems to vary across platforms and server versions"
     )
@@ -2201,10 +2180,6 @@ async def test_pubsub_sharded_max_size_message_callback(
                 request, cluster_mode, pub_sub, timeout=10000
             )
 
-            # (Valkey version > 7)
-            if await check_if_server_version_lt(publishing_client, "7.0.0"):
-                pytest.skip("Valkey version required >= 7.0.0")
-
             assert (
                 await cast(GlideClusterClient, publishing_client).publish(
                     message, channel, sharded=True
@@ -2463,6 +2438,7 @@ async def test_pubsub_numsub(self, request, cluster_mode: bool):
             await client_cleanup(client4, None)
             await client_cleanup(client, None)
 
+    @pytest.mark.skip_if_version_below("7.0.0")
     @pytest.mark.parametrize("cluster_mode", [True])
     async def test_pubsub_shardchannels(self, request, cluster_mode: bool):
         """
@@ -2479,9 +2455,6 @@ async def test_pubsub_shardchannels(self, request, cluster_mode: bool):
             pattern = "test_*"
 
             client = await create_client(request, cluster_mode)
-            min_version = "7.0.0"
-            if await check_if_server_version_lt(client, min_version):
-                pytest.skip(reason=f"Valkey version required >= {min_version}")
             assert type(client) == GlideClusterClient
             # Assert no sharded channels exist yet
             assert await client.pubsub_shardchannels() == []
@@ -2524,6 +2497,7 @@ async def test_pubsub_shardchannels(self, request, cluster_mode: bool):
             await client_cleanup(client2, None)
             await client_cleanup(client, None)
 
+    @pytest.mark.skip_if_version_below("7.0.0")
     @pytest.mark.parametrize("cluster_mode", [True])
     async def test_pubsub_shardnumsub(self, request, cluster_mode: bool):
         """
@@ -2578,9 +2552,7 @@ async def test_pubsub_shardnumsub(self, request, cluster_mode: bool):
 
             # Create a client and check initial subscribers
             client = await create_client(request, cluster_mode)
-            min_version = "7.0.0"
-            if await check_if_server_version_lt(client, min_version):
-                pytest.skip(reason=f"Valkey version required >= {min_version}")
+
             assert type(client) == GlideClusterClient
             assert await client.pubsub_shardnumsub([channel1, channel2, channel3]) == {
                 channel1_bytes: 0,
@@ -2620,6 +2592,7 @@ async def test_pubsub_shardnumsub(self, request, cluster_mode: bool):
             await client_cleanup(client4, None)
             await client_cleanup(client, None)
 
+    @pytest.mark.skip_if_version_below("7.0.0")
     @pytest.mark.parametrize("cluster_mode", [True])
     async def test_pubsub_channels_and_shardchannels_separation(
         self, request, cluster_mode: bool
@@ -2655,10 +2628,6 @@ async def test_pubsub_channels_and_shardchannels_separation(
                 request, cluster_mode, pub_sub
             )
 
-            min_version = "7.0.0"
-            if await check_if_server_version_lt(client1, min_version):
-                pytest.skip(reason=f"Valkey version required >= {min_version}")
-
             assert type(client2) == GlideClusterClient
             # Test pubsub_channels
             assert await client2.pubsub_channels() == [regular_channel_bytes]
@@ -2670,6 +2639,7 @@ async def test_pubsub_channels_and_shardchannels_separation(
             await client_cleanup(client1, pub_sub if cluster_mode else None)
             await client_cleanup(client2, None)
 
+    @pytest.mark.skip_if_version_below("7.0.0")
     @pytest.mark.parametrize("cluster_mode", [True])
     async def test_pubsub_numsub_and_shardnumsub_separation(
         self, request, cluster_mode: bool
@@ -2715,10 +2685,6 @@ async def test_pubsub_numsub_and_shardnumsub_separation(
                 request, cluster_mode, pub_sub1, pub_sub2
             )
 
-            min_version = "7.0.0"
-            if await check_if_server_version_lt(client1, min_version):
-                pytest.skip(reason=f"Valkey version required >= {min_version}")
-
             assert type(client2) == GlideClusterClient
 
             # Test pubsub_numsub