fixing tests

Author: sanderegg

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

@@ -371,10 +371,6 @@ async def test_project_listing_inside_of_private_folder(
 
 @pytest.fixture
 def mock_storage_delete_data_folders(mocker: MockerFixture) -> mock.Mock:
-    mocker.patch(
-        "simcore_service_webserver.dynamic_scheduler.api.list_dynamic_services",
-        autospec=True,
-    )
     mocker.patch(
         "simcore_service_webserver.projects._projects_service.remove_project_dynamic_services",
         autospec=True,
@@ -391,8 +387,8 @@ def mock_storage_delete_data_folders(mocker: MockerFixture) -> mock.Mock:
 
 @pytest.mark.parametrize("user_role,expected", [(UserRole.USER, status.HTTP_200_OK)])
 async def test_folders_deletion(
-    client: TestClient,
     mocked_dynamic_services_interface: dict[str, mock.MagicMock],
+    client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,

services/web/server/tests/unit/with_dbs/04/notifications/test_notifications__db_comp_tasks_listening_task.py

@@ -259,6 +259,7 @@ async def _check_for_stability(
 
 @pytest.mark.parametrize("user_role", [UserRole.USER])
 async def test_db_listener_upgrades_projects_row_correctly(
+    mocked_dynamic_services_interface: dict[str, mock.MagicMock],
     with_started_listening_task: None,
     mock_dynamic_service_rpc: mock.AsyncMock,
     sqlalchemy_async_engine: AsyncEngine,

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

@@ -23,10 +23,6 @@
 
 @pytest.fixture
 def mock_storage_delete_data_folders(mocker: MockerFixture) -> mock.Mock:
-    mocker.patch(
-        "simcore_service_webserver.dynamic_scheduler.api.list_dynamic_services",
-        autospec=True,
-    )
     mocker.patch(
         "simcore_service_webserver.projects._projects_service.remove_project_dynamic_services",
         autospec=True,

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

@@ -185,6 +185,7 @@ async def _move_folder_to_workspace_and_assert(
 
 
 async def test_moving_between_private_and_shared_workspaces(
+    mocked_dynamic_services_interface: dict[str, mock.MagicMock],
     client: TestClient,
     logged_user: UserInfoDict,
     fake_project: ProjectDict,

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

@@ -7,6 +7,7 @@
 
 from copy import deepcopy
 from http import HTTPStatus
+from unittest import mock
 
 import pytest
 import sqlalchemy as sa
@@ -43,6 +44,7 @@ async def test_moving_between_workspaces_user_role_permissions(
 
 @pytest.mark.parametrize("user_role,expected", [(UserRole.USER, status.HTTP_200_OK)])
 async def test_moving_between_private_and_shared_workspaces(
+    mocked_dynamic_services_interface: dict[str, mock.MagicMock],
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,
@@ -109,6 +111,7 @@ async def test_moving_between_private_and_shared_workspaces(
 
 @pytest.mark.parametrize("user_role,expected", [(UserRole.USER, status.HTTP_200_OK)])
 async def test_moving_between_shared_and_shared_workspaces(
+    mocked_dynamic_services_interface: dict[str, mock.MagicMock],
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,
@@ -174,6 +177,7 @@ async def test_moving_between_shared_and_shared_workspaces(
 
 @pytest.mark.parametrize("user_role,expected", [(UserRole.USER, status.HTTP_200_OK)])
 async def test_moving_between_workspaces_check_removed_from_folder(
+    mocked_dynamic_services_interface: dict[str, mock.MagicMock],
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,