fixed tests dependencies

Author: sanderegg

services/dynamic-sidecar/tests/unit/test_api_rpc__disk_usage.py

@@ -15,7 +15,6 @@
 from servicelib.rabbitmq.rpc_interfaces.dynamic_sidecar import disk_usage
 from settings_library.rabbit import RabbitSettings
 from settings_library.redis import RedisSettings
-from simcore_service_dynamic_sidecar.core.application import create_app
 from simcore_service_dynamic_sidecar.core.settings import ApplicationSettings
 from simcore_service_dynamic_sidecar.modules.system_monitor._disk_usage import (
     get_disk_usage_monitor,
@@ -54,8 +53,7 @@ def mock_environment(
 
 
 @pytest.fixture
-async def app(mock_environment: EnvVarsDict) -> AsyncIterable[FastAPI]:
-    app = create_app()
+async def app(app: FastAPI, mock_environment: EnvVarsDict) -> AsyncIterable[FastAPI]:
     async with LifespanManager(app):
         yield app
 

services/dynamic-sidecar/tests/unit/test_core_validation.py

@@ -17,6 +17,14 @@
 )
 from simcore_service_dynamic_sidecar.modules.mounted_fs import MountedVolumes
 
+pytest_simcore_core_services_selection = [
+    "postgres",
+]
+
+pytest_simcore_ops_services_selection = [
+    "adminer",
+]
+
 
 @pytest.fixture
 def incoming_iseg_compose_file_content() -> str:

services/dynamic-sidecar/tests/unit/test_modules_mounted_fs.py

@@ -17,7 +17,13 @@
     _name_from_full_path,
 )
 
-# UTILS
+pytest_simcore_core_services_selection = [
+    "postgres",
+]
+
+pytest_simcore_ops_services_selection = [
+    "adminer",
+]
 
 
 def _replace_slashes(path: Path) -> str:

services/dynamic-sidecar/tests/unit/test_modules_notifier.py

@@ -38,7 +38,6 @@
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
 from servicelib.utils import logged_gather
 from settings_library.rabbit import RabbitSettings
-from simcore_service_dynamic_sidecar.core.application import create_app
 from simcore_service_dynamic_sidecar.core.settings import ApplicationSettings
 from simcore_service_dynamic_sidecar.modules.notifications import (
     PortNotifier,
@@ -84,6 +83,7 @@ def mock_environment(
 
 @pytest.fixture
 async def app(
+    app: FastAPI,
     mock_environment: EnvVarsDict,
     mock_registry_service: AsyncMock,
     mock_storage_check: None,
@@ -94,7 +94,6 @@ async def app(
         return_value=[],
     )
 
-    app: FastAPI = create_app()
     async with LifespanManager(app):
         yield app
 

services/dynamic-sidecar/tests/unit/test_modules_outputs_event_filter.py

@@ -2,8 +2,8 @@
 # pylint:disable=unused-argument
 
 import asyncio
+from collections.abc import AsyncIterator
 from pathlib import Path
-from typing import AsyncIterator
 from unittest.mock import AsyncMock
 
 import pytest
@@ -24,15 +24,22 @@
 from tenacity.stop import stop_after_delay
 from tenacity.wait import wait_fixed
 
+pytest_simcore_core_services_selection = [
+    "postgres",
+]
+
+pytest_simcore_ops_services_selection = [
+    "adminer",
+]
+
+
 _TENACITY_RETRY_PARAMS = {
     "reraise": True,
     "retry": retry_if_exception_type(AssertionError),
     "stop": stop_after_delay(10),
     "wait": wait_fixed(0.01),
 }
 
-# FIXTURES
-
 
 @pytest.fixture
 def outputs_path(tmp_path: Path) -> Path:

services/dynamic-sidecar/tests/unit/test_modules_outputs_event_handler.py

@@ -29,6 +29,14 @@
     FileSystemEvent,
 )
 
+pytest_simcore_core_services_selection = [
+    "postgres",
+]
+
+pytest_simcore_ops_services_selection = [
+    "adminer",
+]
+
 
 @pytest.fixture
 def path_to_observe(tmp_path: Path) -> Path:
@@ -232,7 +240,6 @@ def get(self) -> Any | None:
 def test_port_keys_event_handler_triggers_for_events(
     mock_state_path: Path, event: FileSystemEvent, expected_port_key: str | None
 ) -> None:
-
     queue = _MockAioQueue()
 
     event_handler = _PortKeysEventHandler(mock_state_path, queue)

services/dynamic-sidecar/tests/unit/test_modules_outputs_manager.py

@@ -4,10 +4,10 @@
 
 import asyncio
 import inspect
+from collections.abc import AsyncIterator, Iterator
 from dataclasses import dataclass
 from inspect import FullArgSpec
 from pathlib import Path
-from typing import AsyncIterator, Iterator
 from unittest.mock import AsyncMock
 
 import pytest
@@ -36,7 +36,13 @@
     setup_outputs_manager,
 )
 
-# UTILS
+pytest_simcore_core_services_selection = [
+    "postgres",
+]
+
+pytest_simcore_ops_services_selection = [
+    "adminer",
+]
 
 
 @dataclass
@@ -106,7 +112,7 @@ async def _mock_upload_outputs(*args, **kwargs) -> None:
         side_effect=_mock_upload_outputs,
     )
 
-    yield error_toggle
+    return error_toggle
 
 
 @pytest.fixture(params=[1, 4, 10])

services/dynamic-sidecar/tests/unit/test_modules_outputs_watcher.py

@@ -46,6 +46,14 @@
 from tenacity.stop import stop_after_delay
 from tenacity.wait import wait_fixed
 
+pytest_simcore_core_services_selection = [
+    "postgres",
+]
+
+pytest_simcore_ops_services_selection = [
+    "adminer",
+]
+
 _TENACITY_RETRY_PARAMS = {
     "reraise": True,
     "retry": retry_if_exception_type(AssertionError),
@@ -196,7 +204,7 @@ def file_generation_info(request: pytest.FixtureRequest) -> FileGenerationInfo:
 # UTILS
 
 
-async def random_events_in_path(  # noqa: C901
+async def random_events_in_path(
     *,
     port_key_path: Path,
     files_per_port_key: NonNegativeInt,