cleanup

Author: sanderegg

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/application.py

@@ -137,8 +137,9 @@ def create_base_app() -> FastAPI:
     logger.debug(settings.model_dump_json(indent=2))
 
     # minimal
+    assert settings.SC_BOOT_MODE  # nosec
     app = FastAPI(
-        debug=settings.SC_BOOT_MODE.is_devel_mode(),  # pylint: disable=no-member
+        debug=settings.SC_BOOT_MODE.is_devel_mode(),
         title=PROJECT_NAME,
         description=SUMMARY,
         version=API_VERSION,
@@ -199,7 +200,8 @@ def create_app():
 
     # ERROR HANDLERS  ------------
     app.add_exception_handler(
-        NodeNotFound, node_not_found_error_handler  # type: ignore[arg-type]
+        NodeNotFound,
+        node_not_found_error_handler,  # type: ignore[arg-type]
     )
     app.add_exception_handler(BaseDynamicSidecarError, http_error_handler)  # type: ignore[arg-type]
 

services/dynamic-sidecar/tests/conftest.py

@@ -8,7 +8,7 @@
 import json
 import logging
 import sys
-from collections.abc import AsyncIterable, Iterable, Iterator
+from collections.abc import Iterable, Iterator
 from pathlib import Path
 from unittest.mock import AsyncMock
 
@@ -151,13 +151,6 @@ def mock_storage_check(mocker: MockerFixture) -> None:
     )
 
 
-@pytest.fixture
-def mock_postgres_check(mocker: MockerFixture) -> None:
-    mocker.patch(
-        "simcore_service_dynamic_sidecar.core.external_dependencies.connect_to_db",
-    )
-
-
 @pytest.fixture
 def mock_rabbit_check(mocker: MockerFixture) -> None:
     mocker.patch(
@@ -210,7 +203,6 @@ def base_mock_envs(
 def mock_environment(
     postgres_host_config: PostgresTestConfig,
     mock_storage_check: None,
-    # mock_postgres_check: None,
     mock_rabbit_check: None,
     monkeypatch: pytest.MonkeyPatch,
     base_mock_envs: EnvVarsDict,
@@ -357,7 +349,7 @@ def mock_metrics_params(faker: Faker) -> CreateServiceMetricsAdditionalParams:
 
 
 @pytest.fixture
-def cleanup_reserved_disk_space() -> AsyncIterable[None]:
+def cleanup_reserved_disk_space() -> Iterator[None]:
     remove_reserved_disk_space()
     yield
     remove_reserved_disk_space()

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

@@ -8,6 +8,7 @@
 from unittest.mock import AsyncMock
 
 import pytest
+import sqlalchemy as sa
 from aiodocker.volumes import DockerVolume
 from async_asgi_testclient import TestClient
 from fastapi import FastAPI
@@ -41,6 +42,7 @@
 
 @pytest.fixture
 def app(
+    postgres_db: sa.engine.Engine,
     mock_environment: EnvVarsDict,
     mock_registry_service: AsyncMock,
     mock_core_rabbitmq: dict[str, AsyncMock],
@@ -72,7 +74,7 @@ async def test_client(
 @pytest.fixture
 async def ensure_external_volumes(
     app: FastAPI,
-) -> AsyncIterator[tuple[DockerVolume]]:
+) -> AsyncIterator[tuple[DockerVolume, ...]]:
     """ensures inputs and outputs volumes for the service are present
 
     Emulates creation of volumes by the directorv2 when it spawns the dynamic-sidecar service