add dependencies

Author: sanderegg

services/dynamic-sidecar/tests/unit/test_api_rest_containers.py renamed to services/dynamic-sidecar/tests/unit/__test_api_rest_containers.py

@@ -5,10 +5,10 @@
 
 import asyncio
 import json
-from collections.abc import AsyncIterable
+from collections.abc import AsyncIterable, AsyncIterator
 from inspect import signature
 from pathlib import Path
-from typing import Any, AsyncIterator, Final
+from typing import Any, Final
 from unittest.mock import AsyncMock, Mock
 from uuid import uuid4
 
@@ -47,6 +47,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",
+]
+
 WAIT_FOR_OUTPUTS_WATCHER: Final[float] = 0.1
 FAST_POLLING_INTERVAL: Final[float] = 0.1
 
@@ -135,7 +143,6 @@ async def _start_containers(
 
 
 async def _docker_ps_a_container_names() -> list[str]:
-    # TODO: replace with aiodocker this is legacy by now
     command = 'docker ps -a --format "{{.Names}}"'
     success, stdout, *_ = await async_command(command=command, timeout=None)
 
@@ -163,7 +170,9 @@ async def _assert_compose_spec_pulled(compose_spec: str, settings: ApplicationSe
 
 
 @pytest.fixture
-def mock_environment(mock_rabbitmq_envs: EnvVarsDict) -> EnvVarsDict:
+def mock_environment(
+    mock_environment: EnvVarsDict, mock_rabbitmq_envs: EnvVarsDict
+) -> EnvVarsDict:
     return mock_rabbitmq_envs
 
 
@@ -451,7 +460,6 @@ def _expected_error_string(status_code: int) -> dict[str, Any]:
         }
 
     for container in started_containers:
-
         # inspect container
         response = await test_client.get(f"/{API_VTAG}/containers/{container}")
         assert response.status_code == mock_aiodocker_containers_get, response.text
@@ -702,9 +710,9 @@ def define_inactivity_command(
 @pytest.fixture
 def mock_shared_store(app: FastAPI) -> None:
     shared_store: SharedStore = app.state.shared_store
-    shared_store.original_to_container_names[
+    shared_store.original_to_container_names["mock_container_name"] = (
         "mock_container_name"
-    ] = "mock_container_name"
+    )
 
 
 async def test_containers_activity_command_failed(

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

@@ -47,6 +47,14 @@
 from simcore_service_dynamic_sidecar.modules.outputs._context import OutputsContext
 from simcore_service_dynamic_sidecar.modules.outputs._manager import OutputsManager
 
+pytest_simcore_core_services_selection = [
+    "postgres",
+]
+
+pytest_simcore_ops_services_selection = [
+    "adminer",
+]
+
 FAST_STATUS_POLL: Final[float] = 0.1
 CREATE_SERVICE_CONTAINERS_TIMEOUT: Final[float] = 60
 DEFAULT_COMMAND_TIMEOUT: Final[int] = 5
@@ -389,9 +397,11 @@ async def test_create_containers_task(
     mock_metrics_params: CreateServiceMetricsAdditionalParams,
     shared_store: SharedStore,
 ) -> None:
-    last_progress_message: tuple[str, float] | None = None
+    last_progress_message: tuple[str, ProgressPercent | None] | None = None
 
-    async def create_progress(message: str, percent: float, _: TaskId) -> None:
+    async def create_progress(
+        message: str, percent: ProgressPercent | None, _: TaskId
+    ) -> None:
         nonlocal last_progress_message
         last_progress_message = (message, percent)
         print(message, percent)

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

@@ -7,6 +7,14 @@
     _RESERVED_DISK_SPACE_NAME,
 )
 
+pytest_simcore_core_services_selection = [
+    "postgres",
+]
+
+pytest_simcore_ops_services_selection = [
+    "adminer",
+]
+
 
 async def test_reserved_disk_space_freed(
     cleanup_reserved_disk_space: None, test_client: TestClient

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

@@ -32,6 +32,14 @@
     UserServicesMetrics,
 )
 
+pytest_simcore_core_services_selection = [
+    "postgres",
+]
+
+pytest_simcore_ops_services_selection = [
+    "adminer",
+]
+
 _FAST_STATUS_POLL: Final[float] = 0.1
 _CREATE_SERVICE_CONTAINERS_TIMEOUT: Final[float] = 60
 

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

@@ -9,6 +9,14 @@
 from simcore_service_dynamic_sidecar._meta import API_VTAG
 from simcore_service_dynamic_sidecar.models.shared_store import SharedStore
 
+pytest_simcore_core_services_selection = [
+    "postgres",
+]
+
+pytest_simcore_ops_services_selection = [
+    "adminer",
+]
+
 
 @pytest.mark.parametrize(
     "volume_category, initial_expected_status",

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

@@ -49,6 +49,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",
+]
+
 _FAST_STATUS_POLL: Final[float] = 0.1
 _CREATE_SERVICE_CONTAINERS_TIMEOUT: Final[float] = 60
 _BASE_HEART_BEAT_INTERVAL: Final[float] = 0.1

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

@@ -2,8 +2,7 @@
 # pylint:disable=redefined-outer-name
 # pylint:disable=unused-argument
 
-from collections.abc import Awaitable, Callable
-from typing import AsyncIterable
+from collections.abc import AsyncIterable, Awaitable, Callable
 from unittest.mock import AsyncMock
 
 import pytest
@@ -23,10 +22,15 @@
 )
 
 pytest_simcore_core_services_selection = [
+    "postgres",
     "redis",
     "rabbit",
 ]
 
+pytest_simcore_ops_services_selection = [
+    "adminer",
+]
+
 
 @pytest.fixture
 def mock_environment(

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

@@ -11,6 +11,14 @@
 from simcore_service_dynamic_sidecar.cli import main
 from typer.testing import CliRunner
 
+pytest_simcore_core_services_selection = [
+    "postgres",
+]
+
+pytest_simcore_ops_services_selection = [
+    "adminer",
+]
+
 
 @pytest.fixture
 def cli_runner(mock_environment: EnvVarsDict) -> CliRunner:

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

@@ -11,6 +11,14 @@
 from simcore_service_dynamic_sidecar.core.settings import ApplicationSettings
 from simcore_service_dynamic_sidecar.models.shared_store import SharedStore
 
+pytest_simcore_core_services_selection = [
+    "postgres",
+]
+
+pytest_simcore_ops_services_selection = [
+    "adminer",
+]
+
 
 def test_create_app(mock_environment_with_envdevel: EnvVarsDict):
     app = create_app()

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

@@ -23,6 +23,14 @@
 from simcore_service_dynamic_sidecar.core.settings import ApplicationSettings
 from simcore_service_dynamic_sidecar.core.utils import CommandResult
 
+pytest_simcore_core_services_selection = [
+    "postgres",
+]
+
+pytest_simcore_ops_services_selection = [
+    "adminer",
+]
+
 SLEEP_TIME_S = 60
 COMPOSE_SPEC_SAMPLE = {
     "services": {