add test cases for new strategy

Author: Pack-Yak1

tests/test_asyncio/test_cluster.py

@@ -770,9 +770,11 @@ def cmd_init_mock(self, r: ClusterNode) -> None:
             (True, None, [7001, 7002, 7001]),
             (True, LoadBalancingStrategy.ROUND_ROBIN, [7001, 7002, 7001]),
             (True, LoadBalancingStrategy.ROUND_ROBIN_REPLICAS, [7002, 7002, 7002]),
+            (True, LoadBalancingStrategy.RANDOM, [7002, 7001, 7002]),
             (True, LoadBalancingStrategy.RANDOM_REPLICA, [7002, 7002, 7002]),
             (False, LoadBalancingStrategy.ROUND_ROBIN, [7001, 7002, 7001]),
             (False, LoadBalancingStrategy.ROUND_ROBIN_REPLICAS, [7002, 7002, 7002]),
+            (False, LoadBalancingStrategy.RANDOM, [7002, 7001, 7002]),
             (False, LoadBalancingStrategy.RANDOM_REPLICA, [7002, 7002, 7002]),
         ],
     )
@@ -782,6 +784,25 @@ async def test_reading_with_load_balancing_strategies(
         load_balancing_strategy: LoadBalancingStrategy,
         mocks_srv_ports: List[int],
     ) -> None:
+        def _make_mock_randint():
+            _state = 1 # Start with 1 so we have clearly different results from round robin
+
+            def _mock_randint(lower: int, upper: int) -> int:
+                """
+                Return a controlled sequence of numbers when called repeatedly
+                """
+                if lower == upper:
+                    return lower
+
+                nonlocal _state
+                res = _state + lower
+                _state ^= 1
+                return res
+            
+            return _mock_randint
+        
+        mock_randint = _make_mock_randint()
+
         with mock.patch.multiple(
             Connection,
             send_command=mock.DEFAULT,
@@ -792,7 +813,9 @@ async def test_reading_with_load_balancing_strategies(
         ) as mocks:
             with mock.patch.object(
                 ClusterNode, "execute_command", autospec=True
-            ) as execute_command:
+            ) as execute_command, patch(
+                "random.randint", wraps=mock_randint
+            ):
 
                 async def execute_command_mock_first(self, *args, **options):
                     await self.connection_class(**self.connection_kwargs).connect()
@@ -1092,6 +1115,7 @@ async def test_get_and_set(self, r: RedisCluster) -> None:
         [
             LoadBalancingStrategy.ROUND_ROBIN,
             LoadBalancingStrategy.ROUND_ROBIN_REPLICAS,
+            LoadBalancingStrategy.RANDOM,
             LoadBalancingStrategy.RANDOM_REPLICA,
         ],
     )

tests/test_cluster.py

@@ -660,9 +660,11 @@ def cmd_init_mock(self, r):
             (True, None, [7001, 7002, 7001]),
             (True, LoadBalancingStrategy.ROUND_ROBIN, [7001, 7002, 7001]),
             (True, LoadBalancingStrategy.ROUND_ROBIN_REPLICAS, [7002, 7002, 7002]),
+            (True, LoadBalancingStrategy.RANDOM, [7002, 7001, 7002]),
             (True, LoadBalancingStrategy.RANDOM_REPLICA, [7002, 7002, 7002]),
             (False, LoadBalancingStrategy.ROUND_ROBIN, [7001, 7002, 7001]),
             (False, LoadBalancingStrategy.ROUND_ROBIN_REPLICAS, [7002, 7002, 7002]),
+            (False, LoadBalancingStrategy.RANDOM, [7002, 7001, 7002]),
             (False, LoadBalancingStrategy.RANDOM_REPLICA, [7002, 7002, 7002]),
         ],
     )
@@ -672,6 +674,25 @@ def test_reading_with_load_balancing_strategies(
         load_balancing_strategy: LoadBalancingStrategy,
         mocks_srv_ports: List[int],
     ):
+        def _make_mock_randint():
+            _state = 1 # Start with 1 so we have clearly different results from round robin
+
+            def _mock_randint(lower: int, upper: int) -> int:
+                """
+                Return a controlled sequence of numbers when called repeatedly
+                """
+                if lower == upper:
+                    return lower
+
+                nonlocal _state
+                res = _state + lower
+                _state ^= 1
+                return res
+            
+            return _mock_randint
+        
+        mock_randint = _make_mock_randint()
+
         with patch.multiple(
             Connection,
             send_command=DEFAULT,
@@ -680,7 +701,9 @@ def test_reading_with_load_balancing_strategies(
             can_read=DEFAULT,
             on_connect=DEFAULT,
         ) as mocks:
-            with patch.object(Redis, "parse_response") as parse_response:
+            with patch.object(Redis, "parse_response") as parse_response, patch(
+                "random.randint", wraps=mock_randint
+            ):
 
                 def parse_response_mock_first(connection, *args, **options):
                     # Primary
@@ -732,8 +755,9 @@ def parse_response_mock_third(connection, *args, **options):
                 if (
                     load_balancing_strategy is None
                     or load_balancing_strategy == LoadBalancingStrategy.ROUND_ROBIN
+                    or load_balancing_strategy == LoadBalancingStrategy.RANDOM
                 ):
-                    # in the round robin strategy the primary node can also receive read
+                    # in the round robin and random strategies, the primary node can also receive read
                     # requests and this means that there will be second node connected
                     expected_calls_list.append(call("READONLY"))
 
@@ -1092,6 +1116,7 @@ def test_get_and_set(self, r):
         [
             LoadBalancingStrategy.ROUND_ROBIN,
             LoadBalancingStrategy.ROUND_ROBIN_REPLICAS,
+            LoadBalancingStrategy.RANDOM,
             LoadBalancingStrategy.RANDOM_REPLICA,
         ],
     )