Refactored tests

Author: vladvildanov

redis/multidb/client.py

@@ -34,7 +34,7 @@ def __init__(self, config: MultiDbConfig):
 
         self._health_check_interval = config.health_check_interval
         self._health_check_policy: HealthCheckPolicy = config.health_check_policy.value(
-            config.health_check_probes, config.health_check_delay
+            config.health_check_probes, config.health_check_probes_delay
         )
         self._failure_detectors = config.default_failure_detectors()
 

redis/multidb/config.py

@@ -100,7 +100,7 @@ class MultiDbConfig:
         health_checks: Optional list of additional health checks performed on databases.
         health_check_interval: Time interval for executing health checks.
         health_check_probes: Number of attempts to evaluate the health of a database.
-        health_check_delay: Delay between health check attempts.
+        health_check_probes_delay: Delay between health check attempts.
         health_check_policy: Policy for determining database health based on health checks.
         failover_strategy: Optional strategy for handling database failover scenarios.
         failover_attempts: Number of retries allowed for failover operations.
@@ -138,7 +138,7 @@ class MultiDbConfig:
     health_checks: Optional[List[HealthCheck]] = None
     health_check_interval: float = DEFAULT_HEALTH_CHECK_INTERVAL
     health_check_probes: int = DEFAULT_HEALTH_CHECK_PROBES
-    health_check_delay: float = DEFAULT_HEALTH_CHECK_DELAY
+    health_check_probes_delay: float = DEFAULT_HEALTH_CHECK_DELAY
     health_check_policy: HealthCheckPolicies = DEFAULT_HEALTH_CHECK_POLICY
     failover_strategy: Optional[FailoverStrategy] = None
     failover_attempts: int = DEFAULT_FAILOVER_ATTEMPTS

tests/test_asyncio/test_multidb/test_client.py

@@ -188,29 +188,24 @@ async def test_execute_command_auto_fallback_to_highest_weight_db(
         self, mock_multi_db_config, mock_db, mock_db1, mock_db2, mock_hc
     ):
         databases = create_weighted_list(mock_db, mock_db1, mock_db2)
-        mock_hc.check_health.side_effect = [
-            True,
-            True,
-            True,
-            False,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-        ]
+        db1_counter = 0
+        error_event = asyncio.Event()
+        check = False
+
+        async def mock_check_health(database):
+            nonlocal db1_counter, check
+
+            if database == mock_db1 and not check:
+                db1_counter += 1
+
+                if db1_counter > 1:
+                    error_event.set()
+                    check = True
+                    return False
+
+            return True
+
+        mock_hc.check_health.side_effect = mock_check_health
 
         with (
             patch.object(mock_multi_db_config, "databases", return_value=databases),
@@ -224,15 +219,15 @@ async def test_execute_command_auto_fallback_to_highest_weight_db(
             mock_db1.client.execute_command.return_value = "OK1"
             mock_db2.client.execute_command.return_value = "OK2"
             mock_multi_db_config.health_check_interval = 0.1
-            mock_multi_db_config.auto_fallback_interval = 0.5
+            mock_multi_db_config.auto_fallback_interval = 0.2
             mock_multi_db_config.failover_strategy = WeightBasedFailoverStrategy()
 
-            client = MultiDBClient(mock_multi_db_config)
-            assert await client.set("key", "value") == "OK1"
-            await asyncio.sleep(0.15)
-            assert await client.set("key", "value") == "OK2"
-            await asyncio.sleep(0.5)
-            assert await client.set("key", "value") == "OK1"
+            async with MultiDBClient(mock_multi_db_config) as client:
+                assert await client.set("key", "value") == "OK1"
+                await error_event.wait()
+                assert await client.set("key", "value") == "OK2"
+                await asyncio.sleep(0.2)
+                assert await client.set("key", "value") == "OK1"
 
     @pytest.mark.asyncio
     @pytest.mark.parametrize(

tests/test_multidb/conftest.py

@@ -111,7 +111,7 @@ def mock_multi_db_config(request, mock_fd, mock_fs, mock_hc, mock_ed) -> MultiDb
         databases_config=[Mock(spec=DatabaseConfig)],
         failure_detectors=[mock_fd],
         health_check_interval=hc_interval,
-        health_check_delay=0.05,
+        health_check_probes_delay=0.05,
         health_check_policy=health_check_policy,
         health_check_probes=health_check_probes,
         failover_strategy=mock_fs,

tests/test_multidb/test_client.py

@@ -1,17 +1,21 @@
+import threading
 from time import sleep
 from unittest.mock import patch, Mock
 
 import pybreaker
 import pytest
 
+from redis.backoff import NoBackoff
 from redis.event import EventDispatcher, OnCommandsFailEvent
+from redis.exceptions import ConnectionError
 from redis.multidb.circuit import State as CBState, PBCircuitBreakerAdapter
 from redis.multidb.database import SyncDatabase
 from redis.multidb.client import MultiDBClient
 from redis.multidb.exception import NoValidDatabaseException
 from redis.multidb.failover import WeightBasedFailoverStrategy
 from redis.multidb.failure_detector import FailureDetector
 from redis.multidb.healthcheck import HealthCheck, EchoHealthCheck
+from redis.retry import Retry
 from tests.test_multidb.conftest import create_weighted_list
 
 
@@ -184,29 +188,24 @@ def test_execute_command_auto_fallback_to_highest_weight_db(
         self, mock_multi_db_config, mock_db, mock_db1, mock_db2, mock_hc
     ):
         databases = create_weighted_list(mock_db, mock_db1, mock_db2)
-        mock_hc.check_health.side_effect = [
-            True,
-            True,
-            True,
-            False,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-            True,
-        ]
+        db1_counter = 0
+        error_event = threading.Event()
+        check = False
+
+        def mock_check_health(database):
+            nonlocal db1_counter, check
+
+            if database == mock_db1 and not check:
+                db1_counter += 1
+
+                if db1_counter > 1:
+                    error_event.set()
+                    check = True
+                    return False
+
+            return True
+
+        mock_hc.check_health.side_effect = mock_check_health
 
         with (
             patch.object(mock_multi_db_config, "databases", return_value=databases),
@@ -220,14 +219,14 @@ def test_execute_command_auto_fallback_to_highest_weight_db(
             mock_db1.client.execute_command.return_value = "OK1"
             mock_db2.client.execute_command.return_value = "OK2"
             mock_multi_db_config.health_check_interval = 0.1
-            mock_multi_db_config.auto_fallback_interval = 0.5
+            mock_multi_db_config.auto_fallback_interval = 0.2
             mock_multi_db_config.failover_strategy = WeightBasedFailoverStrategy()
 
             client = MultiDBClient(mock_multi_db_config)
             assert client.set("key", "value") == "OK1"
-            sleep(0.18)
+            error_event.wait(timeout=0.5)
             assert client.set("key", "value") == "OK2"
-            sleep(0.5)
+            sleep(0.2)
             assert client.set("key", "value") == "OK1"
 
     @pytest.mark.parametrize(

tests/test_scenario/conftest.py

@@ -140,7 +140,7 @@ def r_multi_db(
         health_check_probes=3,
         health_check_interval=health_check_interval,
         event_dispatcher=event_dispatcher,
-        health_check_delay=health_check_delay,
+        health_check_probes_delay=health_check_delay,
     )
 
     return MultiDBClient(config), listener, endpoint_config