refactored tests

Author: Andrei Neagu

services/dynamic-scheduler/tests/conftest.py

@@ -25,6 +25,7 @@
     "pytest_simcore.cli_runner",
     "pytest_simcore.docker_compose",
     "pytest_simcore.docker_swarm",
+    "pytest_simcore.docker",
     "pytest_simcore.environment_configs",
     "pytest_simcore.faker_projects_data",
     "pytest_simcore.faker_users_data",

services/dynamic-scheduler/tests/unit/service_generic_scheduler/conftest.py

@@ -0,0 +1,22 @@
+from collections.abc import Callable, Iterable
+
+import pytest
+from simcore_service_dynamic_scheduler.services.generic_scheduler import (
+    Operation,
+    OperationName,
+    OperationRegistry,
+)
+
+
+@pytest.fixture
+def register_operation() -> Iterable[Callable[[OperationName, Operation], None]]:
+    to_unregister: list[OperationName] = []
+
+    def _(opration_name: OperationName, operation: Operation) -> None:
+        OperationRegistry.register(opration_name, operation)
+        to_unregister.append(opration_name)
+
+    yield _
+
+    for opration_name in to_unregister:
+        OperationRegistry.unregister(opration_name)

services/dynamic-scheduler/tests/unit/service_generic_scheduler/test__core.py

@@ -16,7 +16,6 @@
 from asgi_lifespan import LifespanManager
 from fastapi import FastAPI
 from pydantic import NonNegativeInt
-from pytest_mock import MockerFixture
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.utils import limited_gather
 from settings_library.rabbit import RabbitSettings
@@ -26,7 +25,6 @@
     BaseStep,
     Operation,
     OperationName,
-    OperationRegistry,
     ParallelStepGroup,
     ProvidedOperationContext,
     RequiredOperationContext,
@@ -73,16 +71,6 @@
 _PARALLEL_APP_CREATION: Final[NonNegativeInt] = 5
 
 
-@pytest.fixture
-def disable_other_generic_scheduler_modules(mocker: MockerFixture) -> None:
-    # these also use redis
-    generic_scheduler_module = (
-        "simcore_service_dynamic_scheduler.services.generic_scheduler"
-    )
-    mocker.patch(f"{generic_scheduler_module}._store.lifespan")
-    mocker.patch(f"{generic_scheduler_module}._core.lifespan")
-
-
 @pytest.fixture
 def app_environment(
     disable_postgres_lifespan: None,
@@ -129,20 +117,6 @@ async def selected_app(
     return choice(apps)
 
 
-@pytest.fixture
-def register_operation() -> Iterable[Callable[[OperationName, Operation], None]]:
-    to_unregister: list[OperationName] = []
-
-    def _(opration_name: OperationName, operation: Operation) -> None:
-        OperationRegistry.register(opration_name, operation)
-        to_unregister.append(opration_name)
-
-    yield _
-
-    for opration_name in to_unregister:
-        OperationRegistry.unregister(opration_name)
-
-
 @pytest.fixture
 def operation_name() -> OperationName:
     return "test_op"