mocks

Author: pcrespov

services/web/server/src/simcore_service_webserver/diagnostics/_handlers.py

@@ -21,7 +21,7 @@
 from ..login.decorators import login_required
 from ..resource_usage._client import is_resource_usage_tracking_service_responsive
 from ..security.decorators import permission_required
-from ..storage import api as storage_api
+from ..storage import api as storage_service
 from ..utils import TaskInfoDict, get_task_info, get_tracemalloc_info
 from ..utils_aiohttp import envelope_json_response
 
@@ -120,7 +120,7 @@ async def _check_pg():
 
     async def _check_storage():
         check.services["storage"] = {
-            "healthy": await storage_api.is_healthy(request.app),
+            "healthy": await storage_service.is_healthy(request.app),
             "status_url": _get_url_for("get_service_status", service_name="storage"),
         }
 
@@ -160,7 +160,7 @@ async def get_service_status(request: web.Request):
 
     if service_name == "storage":
         with suppress(ClientError):
-            status = await storage_api.get_app_status(request.app)
+            status = await storage_service.get_app_status(request.app)
             return envelope_json_response(status)
 
     raise web.HTTPNotFound

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

@@ -112,7 +112,7 @@
     send_message_to_standard_group,
     send_message_to_user,
 )
-from ..storage import api as storage_api
+from ..storage import api as storage_service
 from ..users.api import FullNameDict, get_user, get_user_fullname, get_user_role
 from ..users.exceptions import UserNotFoundError
 from ..users.preferences_api import (
@@ -920,7 +920,7 @@ async def _remove_service_and_its_data_folders(
         )
 
     # remove the node's data if any
-    await storage_api.delete_data_folders_of_project_node(
+    await storage_service.delete_data_folders_of_project_node(
         app, f"{project_uuid}", node_uuid, user_id
     )
 

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

@@ -1072,8 +1072,8 @@ async def test_project_node_lifetime(  # noqa: PLR0915
     faker: Faker,
     create_dynamic_service_mock: Callable[..., Awaitable[DynamicServiceGet]],
 ):
-    mock_storage_api_delete_data_folders_of_project_node = mocker.patch(
-        "simcore_service_webserver.projects._projects_rest._projects_service.storage_api.delete_data_folders_of_project_node",
+    mock_storage_service_delete_data_folders_of_project_node = mocker.patch(
+        "simcore_service_webserver.projects._projects_service.storage_service.delete_data_folders_of_project_node",
         return_value="",
     )
     assert client.app
@@ -1180,18 +1180,18 @@ async def test_project_node_lifetime(  # noqa: PLR0915
         mocked_dynamic_services_interface[
             "dynamic_scheduler.api.stop_dynamic_service"
         ].assert_called_once()
-        mock_storage_api_delete_data_folders_of_project_node.assert_called_once()
+        mock_storage_service_delete_data_folders_of_project_node.assert_called_once()
     else:
         mocked_dynamic_services_interface[
             "dynamic_scheduler.api.stop_dynamic_service"
         ].assert_not_called()
-        mock_storage_api_delete_data_folders_of_project_node.assert_not_called()
+        mock_storage_service_delete_data_folders_of_project_node.assert_not_called()
 
     # delete the NOT dynamic node
     mocked_dynamic_services_interface[
         "dynamic_scheduler.api.stop_dynamic_service"
     ].reset_mock()
-    mock_storage_api_delete_data_folders_of_project_node.reset_mock()
+    mock_storage_service_delete_data_folders_of_project_node.reset_mock()
     url = client.app.router["delete_node"].url_for(
         project_id=user_project["uuid"], node_id=computational_node_id
     )
@@ -1201,12 +1201,12 @@ async def test_project_node_lifetime(  # noqa: PLR0915
         mocked_dynamic_services_interface[
             "dynamic_scheduler.api.stop_dynamic_service"
         ].assert_not_called()
-        mock_storage_api_delete_data_folders_of_project_node.assert_called_once()
+        mock_storage_service_delete_data_folders_of_project_node.assert_called_once()
     else:
         mocked_dynamic_services_interface[
             "dynamic_scheduler.api.stop_dynamic_service"
         ].assert_not_called()
-        mock_storage_api_delete_data_folders_of_project_node.assert_not_called()
+        mock_storage_service_delete_data_folders_of_project_node.assert_not_called()
 
 
 @pytest.fixture

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

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