fixed test

Author: sanderegg

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

@@ -31,15 +31,6 @@
 logger = logging.getLogger(__name__)
 
 
-#
-# APP and CLIENT fixtures
-#
-#  In this context by default all external services are
-#  mocked (e.g. registry, rabbitmq, ...)
-#
-#
-
-
 @pytest.fixture
 def app(
     postgres_db: sa.engine.Engine,

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

@@ -6,6 +6,7 @@
 from unittest.mock import AsyncMock
 
 import pytest
+import sqlalchemy as sa
 from asgi_lifespan import LifespanManager
 from fastapi import FastAPI
 from models_library.api_schemas_dynamic_sidecar.telemetry import DiskUsage
@@ -15,6 +16,7 @@
 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,
@@ -33,27 +35,25 @@
 
 @pytest.fixture
 def mock_environment(
+    mock_environment: EnvVarsDict,
     monkeypatch: pytest.MonkeyPatch,
     rabbit_service: RabbitSettings,
     redis_service: RedisSettings,
-    mock_environment: EnvVarsDict,
     mock_registry_service: AsyncMock,
 ) -> EnvVarsDict:
     return setenvs_from_dict(
         monkeypatch,
         {
             "DY_SIDECAR_SYSTEM_MONITOR_TELEMETRY_ENABLE": "true",
-            "RABBIT_HOST": rabbit_service.RABBIT_HOST,
-            "RABBIT_PASSWORD": rabbit_service.RABBIT_PASSWORD.get_secret_value(),
-            "RABBIT_PORT": f"{rabbit_service.RABBIT_PORT}",
-            "RABBIT_SECURE": f"{rabbit_service.RABBIT_SECURE}",
-            "RABBIT_USER": rabbit_service.RABBIT_USER,
         },
     )
 
 
 @pytest.fixture
-async def app(app: FastAPI, mock_environment: EnvVarsDict) -> AsyncIterable[FastAPI]:
+async def app(
+    postgres_db: sa.engine.Engine, mock_environment: EnvVarsDict
+) -> AsyncIterable[FastAPI]:
+    app = create_app()
     async with LifespanManager(app):
         yield app