Fixed tests

Author: vladvildanov

redis/asyncio/multidb/event.py

@@ -51,7 +51,7 @@ async def listen(self, event: AsyncActiveDatabaseChanged):
             new_pubsub.patterns = old_pubsub.patterns
             await new_pubsub.on_connect(None)
             event.command_executor.active_pubsub = new_pubsub
-            await old_pubsub.close()
+            await old_pubsub.aclose()
 
 class RegisterCommandFailure(AsyncEventListenerInterface):
     """

tests/test_asyncio/test_scenario/conftest.py

@@ -5,7 +5,7 @@
 import pytest
 import pytest_asyncio
 
-from redis.asyncio import Redis
+from redis.asyncio import Redis, RedisCluster
 from redis.asyncio.multidb.client import MultiDBClient
 from redis.asyncio.multidb.config import DEFAULT_FAILURES_THRESHOLD, DEFAULT_HEALTH_CHECK_INTERVAL, DatabaseConfig, \
     MultiDbConfig
@@ -93,6 +93,10 @@ async def r_multi_db(request) -> AsyncGenerator[tuple[MultiDBClient, CheckActive
 
      async def teardown():
          await client.aclose()
+
+         if isinstance(client.command_executor.active_database.client, Redis):
+            await client.command_executor.active_database.client.connection_pool.disconnect()
+
          await asyncio.sleep(15)
 
      yield client, listener, endpoint_config

tests/test_asyncio/test_scenario/test_active_active.py

@@ -186,13 +186,13 @@ async def callback():
                 )
                 await asyncio.sleep(0.5)
 
-        # Execute commands until database failover
-        while not listener.is_changed_flag:
-            await retry.call_with_retry(
-                lambda: callback(),
-                lambda _: dummy_fail_async()
-            )
-            await asyncio.sleep(0.5)
+            # Execute commands until database failover
+            while not listener.is_changed_flag:
+                await retry.call_with_retry(
+                    lambda: callback(),
+                    lambda _: dummy_fail_async()
+                )
+                await asyncio.sleep(0.5)
 
     @pytest.mark.asyncio
     @pytest.mark.parametrize(
@@ -235,13 +235,13 @@ async def callback():
                 )
                 await asyncio.sleep(0.5)
 
-        # Execute pipeline until database failover
-        while not listener.is_changed_flag:
-            await retry.call_with_retry(
-                lambda: callback(),
-                lambda _: dummy_fail_async()
-            )
-            await asyncio.sleep(0.5)
+            # Execute pipeline until database failover
+            while not listener.is_changed_flag:
+                await retry.call_with_retry(
+                    lambda: callback(),
+                    lambda _: dummy_fail_async()
+                )
+                await asyncio.sleep(0.5)
 
     @pytest.mark.asyncio
     @pytest.mark.parametrize(
@@ -352,5 +352,4 @@ async def handler(message):
             # A timeout to ensure that an async handler will handle all previous messages.
             await asyncio.sleep(0.1)
             task.cancel()
-            await pubsub.unsubscribe('test-channel') is True
             assert messages_count >= 2