refactred test

Author: Andrei Neagu

services/director-v2/tests/conftest.py

@@ -208,6 +208,7 @@ async def client(mock_env: EnvVarsDict) -> AsyncIterator[TestClient]:
 async def initialized_app(mock_env: EnvVarsDict) -> AsyncIterable[FastAPI]:
     settings = AppSettings.create_from_envs()
     app = init_app(settings)
+    print("Application settings\n", settings.json(indent=2))
     async with LifespanManager(app):
         yield app
 

services/director-v2/tests/integration/02/test_mixed_dynamic_sidecar_and_legacy_project.py

@@ -65,7 +65,18 @@ def mock_env(
     minio_s3_settings_envs: EnvVarsDict,
     storage_service: URL,
     network_name: str,
+    services_endpoint: dict[str, URL],
 ) -> EnvVarsDict:
+    director_host = services_endpoint["director"].host
+    assert director_host
+    director_port = services_endpoint["director"].port
+    assert director_port
+
+    catalog_host = services_endpoint["catalog"].host
+    assert catalog_host
+    catalog_port = services_endpoint["catalog"].port
+    assert catalog_port
+
     env_vars: EnvVarsDict = {
         "DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS": "{}",
         "TRAEFIK_SIMCORE_ZONE": "test_traefik_zone",
@@ -81,6 +92,10 @@ def mock_env(
         "COMPUTATIONAL_BACKEND_ENABLED": "false",
         "R_CLONE_PROVIDER": "MINIO",
         "DIRECTOR_V2_PROMETHEUS_INSTRUMENTATION_ENABLED": "1",
+        "DIRECTOR_HOST": director_host,
+        "DIRECTOR_PORT": f"{director_port}",
+        "CATALOG_HOST": catalog_host,
+        "CATALOG_PORT": f"{catalog_port}",
     }
     setenvs_from_dict(monkeypatch, env_vars)
     monkeypatch.delenv("DYNAMIC_SIDECAR_MOUNT_PATH_DEV", raising=False)
@@ -159,7 +174,7 @@ def _assemble_node_data(spec: dict, label: str) -> dict[str, str]:
 @pytest.fixture
 async def ensure_services_stopped(
     dy_static_file_server_project: ProjectAtDB,
-    minimal_app: FastAPI,
+    initialized_app: FastAPI,
 ) -> AsyncIterable[None]:
     yield
     # ensure service cleanup when done testing
@@ -178,7 +193,7 @@ async def ensure_services_stopped(
 
         # pylint: disable=protected-access
         scheduler_interval = (
-            minimal_app.state.settings.DYNAMIC_SERVICES.DYNAMIC_SCHEDULER.DIRECTOR_V2_DYNAMIC_SCHEDULER_INTERVAL
+            initialized_app.state.settings.DYNAMIC_SERVICES.DYNAMIC_SCHEDULER.DIRECTOR_V2_DYNAMIC_SCHEDULER_INTERVAL
         )
         # sleep enough to ensure the observation cycle properly stopped the service
         await asyncio.sleep(2 * scheduler_interval.total_seconds())
@@ -213,9 +228,8 @@ async def _mocked_context_manger(*args, **kwargs) -> AsyncIterator[None]:
     )
 
 
-@pytest.mark.flaky(max_runs=3)
 async def test_legacy_and_dynamic_sidecar_run(
-    minimal_app: FastAPI,
+    initialized_app: FastAPI,
     wait_for_catalog_service: Callable[[UserID, str], Awaitable[None]],
     dy_static_file_server_project: ProjectAtDB,
     user_dict: dict[str, Any],
@@ -264,13 +278,7 @@ async def test_legacy_and_dynamic_sidecar_run(
         if is_legacy(node):
             continue
 
-        # NOTE: it seems the minimal_app fixture does not contain the actual data
-        # so we use the one in the async_client??? very strange
-        await patch_dynamic_service_url(
-            # pylint: disable=protected-access
-            app=async_client._transport.app,  # noqa: SLF001 # type: ignore
-            node_uuid=node_id,
-        )
+        await patch_dynamic_service_url(app=initialized_app, node_uuid=node_id)
 
     assert len(dy_static_file_server_project.workbench) == 3
 

services/director-v2/tests/unit/with_dbs/test_cli.py

@@ -81,6 +81,7 @@ def mock_save_service_state(mocker: MockerFixture) -> None:
     mocker.patch(
         "simcore_service_director_v2.modules.dynamic_sidecar.api_client._public.SidecarsClient.save_service_state",
         spec=True,
+        return_value=0,
     )