Fixed None exception

Author: vladvildanov

redis/asyncio/multidb/client.py

@@ -280,7 +280,7 @@ async def _check_databases_health(
                 if on_error:
                     on_error(result.original_exception)
 
-    async def _check_db_health(self, database: AsyncDatabase,) -> bool:
+    async def _check_db_health(self, database: AsyncDatabase) -> bool:
         """
         Runs health checks on the given database until first failure.
         """
@@ -307,7 +307,8 @@ def _on_circuit_state_change_callback(self, circuit: CircuitBreaker, old_state:
             loop.call_later(DEFAULT_GRACE_PERIOD, _half_open_circuit, circuit)
 
     async def aclose(self):
-        await self.command_executor.active_database.client.aclose()
+        if self.command_executor.active_database:
+            await self.command_executor.active_database.client.aclose()
 
 def _half_open_circuit(circuit: CircuitBreaker):
     circuit.state = CBState.HALF_OPEN

tests/test_asyncio/test_scenario/conftest.py

@@ -95,7 +95,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):
+         if (
+                 client.command_executor.active_database
+                 and isinstance(client.command_executor.active_database.client, Redis)
+         ):
             await client.command_executor.active_database.client.connection_pool.disconnect()
 
          await asyncio.sleep(10)