refactoed fixture

Author: Andrei Neagu

packages/pytest-simcore/src/pytest_simcore/redis_service.py

@@ -126,5 +126,6 @@ def mock_redis_socket_timeout(mocker: MockerFixture) -> None:
 
 
 @pytest.fixture
-async def use_in_memory_redis(mocker: MockerFixture) -> None:
+async def use_in_memory_redis(mocker: MockerFixture) -> RedisSettings:
     mocker.patch.object(_client, "aioredis", FakeAsyncRedis)
+    return RedisSettings()

packages/service-library/tests/long_running_tasks/test_long_running_tasks_task.py

@@ -6,8 +6,8 @@
 
 import asyncio
 import urllib.parse
-from collections.abc import AsyncIterator, Callable
-from contextlib import AbstractAsyncContextManager, asynccontextmanager
+from collections.abc import AsyncIterator
+from contextlib import asynccontextmanager
 from datetime import datetime, timedelta
 from typing import Any, Final
 
@@ -24,22 +24,13 @@
 )
 from servicelib.long_running_tasks.models import TaskContext, TaskProgress, TaskStatus
 from servicelib.long_running_tasks.task import TaskRegistry, TasksManager
-from servicelib.redis._client import RedisClientSDK
-from settings_library.redis import RedisDatabase, RedisSettings
+from settings_library.redis import RedisSettings
 from tenacity import TryAgain
 from tenacity.asyncio import AsyncRetrying
 from tenacity.retry import retry_if_exception_type
 from tenacity.stop import stop_after_delay
 from tenacity.wait import wait_fixed
 
-pytest_simcore_core_services_selection = [
-    "redis",
-]
-pytest_simcore_ops_services_selection = [
-    "redis-commander",
-]
-
-
 _RETRY_PARAMS: dict[str, Any] = {
     "reraise": True,
     "wait": wait_fixed(0.1),
@@ -89,35 +80,26 @@ def empty_context() -> TaskContext:
 
 @asynccontextmanager
 async def get_tasks_manager(
-    redis_service: RedisSettings,
-    get_redis_client_sdk: Callable[
-        [RedisDatabase], AbstractAsyncContextManager[RedisClientSDK]
-    ],
+    redis_settings: RedisSettings,
 ) -> AsyncIterator[TasksManager]:
     tasks_manager = TasksManager(
         stale_task_check_interval=timedelta(seconds=TEST_CHECK_STALE_INTERVAL_S),
         stale_task_detect_timeout=timedelta(seconds=TEST_CHECK_STALE_INTERVAL_S),
-        redis_settings=redis_service,
+        redis_settings=redis_settings,
         namespace="test",
     )
     await tasks_manager.setup()
 
     yield tasks_manager
 
     await tasks_manager.teardown()
-    # triggers cleanup of all redis data
-    async with get_redis_client_sdk(RedisDatabase.LONG_RUNNING_TASKS):
-        pass
 
 
 @pytest.fixture
 async def tasks_manager(
-    redis_service: RedisSettings,
-    get_redis_client_sdk: Callable[
-        [RedisDatabase], AbstractAsyncContextManager[RedisClientSDK]
-    ],
+    use_in_memory_redis: RedisSettings,
 ) -> AsyncIterator[TasksManager]:
-    async with get_tasks_manager(redis_service, get_redis_client_sdk) as manager:
+    async with get_tasks_manager(use_in_memory_redis) as manager:
         yield manager
 
 
@@ -371,19 +353,12 @@ async def test_get_result_task_was_cancelled_multiple_times(
 
 
 async def test_cancel_task_from_different_manager(
-    redis_service: RedisSettings,
-    get_redis_client_sdk: Callable[
-        [RedisDatabase], AbstractAsyncContextManager[RedisClientSDK]
-    ],
+    use_in_memory_redis: RedisSettings,
     empty_context: TaskContext,
 ):
-    async with get_tasks_manager(
-        redis_service, get_redis_client_sdk
-    ) as manager_1, get_tasks_manager(
-        redis_service, get_redis_client_sdk
-    ) as manager_2, get_tasks_manager(
-        redis_service, get_redis_client_sdk
-    ) as manager_3:
+    async with get_tasks_manager(use_in_memory_redis) as manager_1, get_tasks_manager(
+        use_in_memory_redis
+    ) as manager_2, get_tasks_manager(use_in_memory_redis) as manager_3:
         task_id = await lrt_api.start_task(
             manager_1,
             a_background_task.__name__,

services/director-v2/tests/unit/test_api_route_dynamic_scheduler.py

@@ -15,6 +15,7 @@
 from models_library.service_settings_labels import SimcoreServiceLabels
 from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.typing_env import EnvVarsDict
+from settings_library.redis import RedisSettings
 from simcore_service_director_v2.models.dynamic_services_scheduler import SchedulerData
 from simcore_service_director_v2.modules.dynamic_sidecar.errors import (
     DynamicSidecarNotFoundError,
@@ -27,7 +28,7 @@
 
 @pytest.fixture
 def mock_env(
-    use_in_memory_redis: None,
+    use_in_memory_redis: RedisSettings,
     mock_exclusive: None,
     disable_rabbitmq: None,
     disable_postgres: None,

services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler.py

@@ -23,6 +23,7 @@
 from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from respx.router import MockRouter
+from settings_library.redis import RedisSettings
 from simcore_service_director_v2.models.dynamic_services_scheduler import (
     DockerContainerInspect,
     DynamicSidecarStatus,
@@ -124,7 +125,7 @@ async def _assert_get_dynamic_services_mocked(
 
 @pytest.fixture
 def mock_env(
-    use_in_memory_redis: None,
+    use_in_memory_redis: RedisSettings,
     mock_exclusive: None,
     disable_postgres: None,
     disable_rabbitmq: None,

services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler_task.py

@@ -20,6 +20,7 @@
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from respx.router import MockRouter
+from settings_library.redis import RedisSettings
 from simcore_service_director_v2.models.dynamic_services_scheduler import SchedulerData
 from simcore_service_director_v2.modules.dynamic_sidecar.api_client._public import (
     SidecarsClient,
@@ -43,7 +44,7 @@
 
 @pytest.fixture
 def mock_env(
-    use_in_memory_redis: None,
+    use_in_memory_redis: RedisSettings,
     disable_postgres: None,
     disable_rabbitmq: None,
     mock_env: EnvVarsDict,

services/dynamic-sidecar/tests/conftest.py

@@ -28,6 +28,7 @@
     setenvs_from_dict,
     setenvs_from_envfile,
 )
+from settings_library.redis import RedisSettings
 from simcore_service_dynamic_sidecar.core.reserved_space import (
     remove_reserved_disk_space,
 )
@@ -168,7 +169,7 @@ def mock_rabbit_check(mocker: MockerFixture) -> None:
 
 @pytest.fixture
 def base_mock_envs(
-    use_in_memory_redis: None,
+    use_in_memory_redis: RedisSettings,
     dy_volumes: Path,
     shared_store_dir: Path,
     compose_namespace: str,
@@ -210,7 +211,7 @@ def base_mock_envs(
 
 @pytest.fixture
 def mock_environment(
-    use_in_memory_redis: None,
+    use_in_memory_redis: RedisSettings,
     mock_storage_check: None,
     mock_postgres_check: None,
     mock_rabbit_check: None,