fix tests

Author: giancarloromeo

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

@@ -92,12 +92,12 @@ def mock_catalog_api(
 ) -> dict[str, mock.Mock]:
     return {
         "get_service_resources": mocker.patch(
-            "simcore_service_webserver.projects.projects_api.catalog_client.get_service_resources",
+            "simcore_service_webserver.projects.projects_service.catalog_client.get_service_resources",
             return_value=mock_service_resources,
             autospec=True,
         ),
         "get_service": mocker.patch(
-            "simcore_service_webserver.projects.projects_api.catalog_client.get_service",
+            "simcore_service_webserver.projects.projects_service.catalog_client.get_service",
             return_value=mock_service,
             autospec=True,
         ),
@@ -374,7 +374,7 @@ def mock_get_total_project_dynamic_nodes_creation_interval(
 ) -> None:
     _VERY_LONG_LOCK_TIMEOUT_S: Final[float] = 300
     mocker.patch(
-        "simcore_service_webserver.projects.projects_api._nodes_api"
+        "simcore_service_webserver.projects.projects_service._nodes_api"
         ".get_total_project_dynamic_nodes_creation_interval",
         return_value=_VERY_LONG_LOCK_TIMEOUT_S,
     )

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

@@ -47,7 +47,7 @@ def mock_project_uses_available_services(mocker: MockerFixture):
 @pytest.fixture
 def mock_catalog_rpc_check_for_service(mocker: MockerFixture):
     mocker.patch(
-        "simcore_service_webserver.projects.projects_api.catalog_rpc.check_for_service",
+        "simcore_service_webserver.projects.projects_service.catalog_rpc.check_for_service",
         spec=True,
         return_value=True,
     )
@@ -56,7 +56,7 @@ def mock_catalog_rpc_check_for_service(mocker: MockerFixture):
 @pytest.fixture
 def mocked_notify_project_node_update(mocker: MockerFixture):
     return mocker.patch(
-        "simcore_service_webserver.projects.projects_api.notify_project_node_update",
+        "simcore_service_webserver.projects.projects_service.notify_project_node_update",
     )
 
 
@@ -362,14 +362,14 @@ async def test_patch_project_node_service_key_with_error(
     _patch_version = {"version": "2.0.9"}
 
     with mocker.patch(
-        "simcore_service_webserver.projects.projects_api.catalog_rpc.check_for_service",
+        "simcore_service_webserver.projects.projects_service.catalog_rpc.check_for_service",
         side_effect=CatalogForbiddenError(name="test"),
     ):
         resp = await client.patch(f"{base_url}", json=_patch_version)
         assert resp.status == status.HTTP_403_FORBIDDEN
 
     with mocker.patch(
-        "simcore_service_webserver.projects.projects_api.catalog_rpc.check_for_service",
+        "simcore_service_webserver.projects.projects_service.catalog_rpc.check_for_service",
         side_effect=CatalogItemNotFoundError(name="test"),
     ):
         resp = await client.patch(f"{base_url}", json=_patch_version)

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

@@ -136,7 +136,7 @@ def _fake_instance_type_details(
         ]
 
     return mocker.patch(
-        "simcore_service_webserver.projects.projects_api.get_instance_type_details",
+        "simcore_service_webserver.projects.projects_service.get_instance_type_details",
         side_effect=_fake_instance_type_details,
     )
 

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

@@ -254,11 +254,11 @@ async def request_delete_project(
     mocker: MockerFixture,
 ) -> AsyncIterator[Callable[[TestClient, UUID], Awaitable]]:
     director_v2_api_delete_pipeline: mock.AsyncMock = mocker.patch(
-        "simcore_service_webserver.projects.projects_api.director_v2_api.delete_pipeline",
+        "simcore_service_webserver.projects.projects_service.director_v2_api.delete_pipeline",
         autospec=True,
     )
     dynamic_scheduler_api_stop_dynamic_services_in_project: mock.AsyncMock = mocker.patch(
-        "simcore_service_webserver.projects.projects_api.dynamic_scheduler_api.stop_dynamic_services_in_project",
+        "simcore_service_webserver.projects.projects_service.dynamic_scheduler_api.stop_dynamic_services_in_project",
         autospec=True,
     )
     fire_and_forget_call_to_storage: mock.Mock = mocker.patch(

services/web/server/tests/unit/with_dbs/04/folders/test_folders.py

@@ -387,7 +387,7 @@ def mock_storage_delete_data_folders(mocker: MockerFixture) -> mock.Mock:
         autospec=True,
     )
     mocker.patch(
-        "simcore_service_webserver.projects.projects_api.remove_project_dynamic_services",
+        "simcore_service_webserver.projects.projects_service.remove_project_dynamic_services",
         autospec=True,
     )
     mocker.patch(

services/web/server/tests/unit/with_dbs/04/garbage_collector/test_resource_manager.py

@@ -657,7 +657,7 @@ async def test_interactive_services_remain_after_websocket_reconnection_from_2_t
 async def mocked_notification_system(mocker):
     mocks = {}
     mocked_notification_system = mocker.patch(
-        "simcore_service_webserver.projects.projects_api.retrieve_and_notify_project_locked_state",
+        "simcore_service_webserver.projects.projects_service.retrieve_and_notify_project_locked_state",
         return_value=Future(),
     )
     mocked_notification_system.return_value.set_result("")

services/web/server/tests/unit/with_dbs/04/studies_dispatcher/test_studies_dispatcher_handlers.py

@@ -302,7 +302,7 @@ def mocks_on_projects_api(mocker) -> None:
     All projects in this module are UNLOCKED
     """
     mocker.patch(
-        "simcore_service_webserver.projects.projects_api._get_project_lock_state",
+        "simcore_service_webserver.projects.projects_service._get_project_lock_state",
         return_value=ProjectLocked(value=False, status=ProjectStatus.CLOSED),
     )
 

services/web/server/tests/unit/with_dbs/04/studies_dispatcher/test_studies_dispatcher_studies_access.py

@@ -132,7 +132,7 @@ def mocks_on_projects_api(mocker: MockerFixture) -> None:
     All projects in this module are UNLOCKED
     """
     mocker.patch(
-        "simcore_service_webserver.projects.projects_api._get_project_lock_state",
+        "simcore_service_webserver.projects.projects_service._get_project_lock_state",
         return_value=ProjectLocked(value=False, status=ProjectStatus.CLOSED),
     )
 

services/web/server/tests/unit/with_dbs/04/workspaces/test_workspaces__folders_and_projects_crud.py

@@ -259,7 +259,7 @@ def mock_storage_delete_data_folders(mocker: MockerFixture) -> mock.Mock:
         autospec=True,
     )
     mocker.patch(
-        "simcore_service_webserver.projects.projects_api.remove_project_dynamic_services",
+        "simcore_service_webserver.projects.projects_service.remove_project_dynamic_services",
         autospec=True,
     )
     mocker.patch(

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

@@ -369,7 +369,7 @@ async def _mock_result():
     )
 
     mock2 = mocker.patch(
-        "simcore_service_webserver.projects.projects_api.storage_api.delete_data_folders_of_project_node",
+        "simcore_service_webserver.projects.projects_service.storage_api.delete_data_folders_of_project_node",
         autospec=True,
         return_value=None,
     )