fixed tests

Author: Andrei Neagu

services/web/server/src/simcore_service_webserver/projects/projects_api.py

@@ -1630,7 +1630,7 @@ async def run_project_dynamic_services(
     # first get the services if they already exist
     project_settings: ProjectsSettings = get_plugin_settings(request.app)
     running_services_uuids: list[NodeIDStr] = [
-        TypeAdapter(NodeIDStr).validate_python(d.node_uuid)
+        f"{d.node_uuid}"
         for d in await dynamic_scheduler_api.list_dynamic_services(
             request.app, user_id=user_id, project_id=ProjectID(project["uuid"])
         )

services/web/server/tests/unit/with_dbs/02/test_projects_metadata_handlers.py

@@ -11,6 +11,7 @@
 import aiopg.sa
 import pytest
 from aiohttp.test_utils import TestClient
+from conftest import MagicMock
 from faker import Faker
 from models_library.api_schemas_webserver.projects_metadata import (
     ProjectMetadataGet,
@@ -40,7 +41,7 @@
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_custom_metadata_handlers(
     # for deletion
-    mocked_director_v2_api: None,
+    mocked_director_v2_api: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,
     #
     client: TestClient,
@@ -114,7 +115,7 @@ async def _wait_until_deleted():
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_new_project_with_parent_project_node(
     # for deletion
-    mocked_director_v2_api: None,
+    mocked_director_v2_api: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,
     #
     client: TestClient,
@@ -191,7 +192,7 @@ async def test_new_project_with_parent_project_node(
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_new_project_with_invalid_parent_project_node(
     # for deletion
-    mocked_director_v2_api: None,
+    mocked_director_v2_api: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,
     #
     client: TestClient,
@@ -274,7 +275,7 @@ async def test_new_project_with_invalid_parent_project_node(
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_set_project_parent_backward_compatibility(
     # for deletion
-    mocked_director_v2_api: None,
+    mocked_director_v2_api: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,
     #
     client: TestClient,
@@ -338,7 +339,7 @@ async def test_set_project_parent_backward_compatibility(
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_update_project_metadata_backward_compatibility_with_same_project_does_not_raises_and_does_not_work(
     # for deletion
-    mocked_director_v2_api: None,
+    mocked_director_v2_api: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,
     #
     client: TestClient,
@@ -393,7 +394,7 @@ async def test_update_project_metadata_backward_compatibility_with_same_project_
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_update_project_metadata_s4lacad_backward_compatibility_passing_nil_parent_node_id(
     # for deletion
-    mocked_director_v2_api: None,
+    mocked_director_v2_api: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,
     #
     client: TestClient,

services/web/server/tests/unit/with_dbs/conftest.py

@@ -396,33 +396,14 @@ def asyncpg_storage_system_mock(mocker):
     )
 
 
-_LIST_DYNAMIC_SERVICES_MODULES_TO_PATCH: Final[list[str]] = [
-    "director_v2.api",
-    "director_v2._core_dynamic_services",
-    "dynamic_scheduler.api",
-]
-
-
 @pytest.fixture
 async def mocked_director_v2_api(mocker: MockerFixture) -> dict[str, MagicMock]:
     mock = {}
 
-    #
-    # NOTE: depending on the test, function might have to be patched
-    #  via the director_v2_api or director_v2_core_dynamic_services modules
-    #
-    for mod_name in _LIST_DYNAMIC_SERVICES_MODULES_TO_PATCH:
-        name = f"{mod_name}.list_dynamic_services"
-        mock[name] = mocker.patch(
-            f"simcore_service_webserver.{name}",
-            autospec=True,
-            return_value=[],
-        )
-    # add here redirects from director-v2 via dynamic-scheduler
-    # NOTE: once all above are moved to dynamic-scheduler
-    # this fixture needs to be renamed to mocked_dynamic_scheduler
+    # TODO: ONCE All tests in CI are green split mock into two separate mocks
 
     for func_name in (
+        "list_dynamic_services",
         "get_dynamic_service",
         "run_dynamic_service",
         "stop_dynamic_service",
@@ -469,10 +450,9 @@ async def _create(**service_override_kwargs) -> DynamicServiceGet:
 
         services.append(running_service)
         # reset the future or an invalidStateError will appear as set_result sets the future to done
-        for module_name in _LIST_DYNAMIC_SERVICES_MODULES_TO_PATCH:
-            mocked_director_v2_api[
-                f"{module_name}.list_dynamic_services"
-            ].return_value = services
+        mocked_director_v2_api[
+            "dynamic_scheduler.api.list_dynamic_services"
+        ].return_value = services
 
         return running_service