refactor

Author: Andrei Neagu

packages/service-library/tests/conftest.py

@@ -1,3 +1,4 @@
+# pylint: disable=contextmanager-generator-missing-cleanup
 # pylint: disable=redefined-outer-name
 # pylint: disable=unused-argument
 # pylint: disable=unused-import
@@ -12,7 +13,6 @@
 import pytest
 import servicelib
 from faker import Faker
-from pytest_mock import MockerFixture
 from servicelib.redis import RedisClientSDK, RedisClientsManager, RedisManagerDBConfig
 from settings_library.redis import RedisDatabase, RedisSettings
 
@@ -69,20 +69,18 @@ def fake_data_dict(faker: Faker) -> dict[str, Any]:
     return data
 
 
-@pytest.fixture
-async def get_redis_client_sdk(
-    mock_redis_socket_timeout: None,
-    mocker: MockerFixture,
-    use_in_memory_redis: RedisSettings,
-) -> AsyncIterable[
+@asynccontextmanager
+async def _get_redis_client_sdk(
+    redis_settings: RedisSettings,
+) -> AsyncIterator[
     Callable[[RedisDatabase], AbstractAsyncContextManager[RedisClientSDK]]
 ]:
     @asynccontextmanager
     async def _(
         database: RedisDatabase,
         decode_response: bool = True,  # noqa: FBT002
     ) -> AsyncIterator[RedisClientSDK]:
-        redis_resources_dns = use_in_memory_redis.build_redis_dsn(database)
+        redis_resources_dns = redis_settings.build_redis_dsn(database)
         client = RedisClientSDK(
             redis_resources_dns, decode_responses=decode_response, client_name="pytest"
         )
@@ -101,9 +99,29 @@ async def _cleanup_redis_data(clients_manager: RedisClientsManager) -> None:
 
     async with RedisClientsManager(
         {RedisManagerDBConfig(database=db) for db in RedisDatabase},
-        use_in_memory_redis,
+        redis_settings,
         client_name="pytest",
     ) as clients_manager:
         await _cleanup_redis_data(clients_manager)
         yield _
         await _cleanup_redis_data(clients_manager)
+
+
+@pytest.fixture
+async def get_redis_client_sdk(
+    mock_redis_socket_timeout: None, use_in_memory_redis: RedisSettings
+) -> AsyncIterable[
+    Callable[[RedisDatabase], AbstractAsyncContextManager[RedisClientSDK]]
+]:
+    async with _get_redis_client_sdk(use_in_memory_redis) as client:
+        yield client
+
+
+@pytest.fixture
+async def get_in_process_redis_client_sdk(
+    mock_redis_socket_timeout: None, redis_service: RedisSettings
+) -> AsyncIterable[
+    Callable[[RedisDatabase], AbstractAsyncContextManager[RedisClientSDK]]
+]:
+    async with _get_redis_client_sdk(redis_service) as client:
+        yield client

packages/service-library/tests/deferred_tasks/conftest.py

@@ -1,29 +1,18 @@
-from collections.abc import AsyncIterator
+from collections.abc import AsyncIterator, Callable
+from contextlib import AbstractAsyncContextManager
 
 import pytest
 from servicelib.redis import RedisClientSDK
-from settings_library.redis import RedisDatabase, RedisSettings
-
-
-async def _cleanup_redis_data(client: RedisClientSDK) -> None:
-    await client.redis.flushall()
+from settings_library.redis import RedisDatabase
 
 
 @pytest.fixture
 async def redis_client_sdk_deferred_tasks(
-    redis_service: RedisSettings,
+    get_in_process_redis_client_sdk: Callable[
+        [RedisDatabase, bool], AbstractAsyncContextManager[RedisClientSDK]
+    ],
 ) -> AsyncIterator[RedisClientSDK]:
-
-    client = RedisClientSDK(
-        redis_service.build_redis_dsn(RedisDatabase.DEFERRED_TASKS),
-        decode_responses=False,
-        client_name="pytest-deferred_tasks",
-    )
-    await client.setup()
-
-    await _cleanup_redis_data(client)
-
-    yield client
-
-    await _cleanup_redis_data(client)
-    await client.shutdown()
+    async with get_in_process_redis_client_sdk(
+        RedisDatabase.DEFERRED_TASKS, decode_response=False
+    ) as client:
+        yield client

packages/service-library/tests/redis/conftest.py

@@ -12,11 +12,11 @@
 
 @pytest.fixture
 async def redis_client_sdk(
-    get_redis_client_sdk: Callable[
+    get_in_process_redis_client_sdk: Callable[
         [RedisDatabase], AbstractAsyncContextManager[RedisClientSDK]
     ],
 ) -> AsyncIterator[RedisClientSDK]:
-    async with get_redis_client_sdk(RedisDatabase.RESOURCES) as client:
+    async with get_in_process_redis_client_sdk(RedisDatabase.RESOURCES) as client:
         yield client