Fixed tests

Author: vladvildanov

redis/asyncio/cluster.py

@@ -2254,7 +2254,7 @@ async def _reinitialize_on_error(self, error):
                 await self._pipe.cluster_client.nodes_manager.initialize()
                 self.reinitialize_counter = 0
             else:
-                if type(error) is MovedError:
+                if isinstance(error, AskError):
                     self._pipe.cluster_client.nodes_manager.update_moved_exception(
                         error
                     )

redis/cluster.py

@@ -3165,7 +3165,7 @@ def _reinitialize_on_error(self, error):
                 self._nodes_manager.initialize()
                 self.reinitialize_counter = 0
             else:
-                if type(error) is MovedError:
+                if isinstance(error, AskError):
                     self._nodes_manager.update_moved_exception(error)
 
         self._executing = False

tests/test_asyncio/test_multidb/test_client.py

@@ -184,41 +184,38 @@ async def test_execute_command_against_correct_db_on_background_health_check_det
         indirect=True,
     )
     async def test_execute_command_auto_fallback_to_highest_weight_db(
-        self, mock_multi_db_config, mock_db, mock_db1, mock_db2
+        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
+        ]
 
         with (
             patch.object(mock_multi_db_config, "databases", return_value=databases),
             patch.object(
                 mock_multi_db_config,
                 "default_health_checks",
-                return_value=[EchoHealthCheck()],
+                return_value=[mock_hc],
             ),
         ):
-            mock_db.client.execute_command.side_effect = [
-                "healthcheck",
-                "healthcheck",
-                "healthcheck",
-                "healthcheck",
-                "healthcheck",
-            ]
-            mock_db1.client.execute_command.side_effect = [
-                "healthcheck",
-                "OK1",
-                "error",
-                "healthcheck",
-                "healthcheck",
-                "OK1",
-            ]
-            mock_db2.client.execute_command.side_effect = [
-                "healthcheck",
-                "healthcheck",
-                "OK2",
-                "healthcheck",
-                "healthcheck",
-                "healthcheck",
-            ]
+            mock_db.client.execute_command.return_value = 'OK'
+            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.2
             mock_multi_db_config.failover_strategy = WeightBasedFailoverStrategy()

tests/test_multidb/test_client.py

@@ -180,50 +180,47 @@ def test_execute_command_against_correct_db_on_background_health_check_determine
         indirect=True,
     )
     def test_execute_command_auto_fallback_to_highest_weight_db(
-        self, mock_multi_db_config, mock_db, mock_db1, mock_db2
+        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
+        ]
 
         with (
             patch.object(mock_multi_db_config, "databases", return_value=databases),
             patch.object(
                 mock_multi_db_config,
                 "default_health_checks",
-                return_value=[EchoHealthCheck()],
+                return_value=[mock_hc],
             ),
         ):
-            mock_db.client.execute_command.side_effect = [
-                "healthcheck",
-                "healthcheck",
-                "healthcheck",
-                "healthcheck",
-                "healthcheck",
-            ]
-            mock_db1.client.execute_command.side_effect = [
-                "healthcheck",
-                "OK1",
-                "error",
-                "healthcheck",
-                "healthcheck",
-                "OK1",
-            ]
-            mock_db2.client.execute_command.side_effect = [
-                "healthcheck",
-                "healthcheck",
-                "OK2",
-                "healthcheck",
-                "healthcheck",
-                "healthcheck",
-            ]
-            mock_multi_db_config.health_check_interval = 0.2
-            mock_multi_db_config.auto_fallback_interval = 0.4
+            mock_db.client.execute_command.return_value = 'OK'
+            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.2
             mock_multi_db_config.failover_strategy = WeightBasedFailoverStrategy()
 
             client = MultiDBClient(mock_multi_db_config)
             assert client.set("key", "value") == "OK1"
-            sleep(0.30)
+            sleep(0.15)
             assert client.set("key", "value") == "OK2"
-            sleep(0.44)
+            sleep(0.22)
             assert client.set("key", "value") == "OK1"
 
     @pytest.mark.parametrize(