fixed tests

Author: Andrei Neagu

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

@@ -239,9 +239,7 @@ async def project_db_cleaner(client: TestClient):
 
 
 @pytest.fixture(autouse=True)
-async def mocked_director_v2_and_dynamic_scheduler_interfaces(
-    mock_dynamic_scheduler: None, director_v2_service_mock: aioresponses
-) -> None:
+async def mocked_director_v2(director_v2_service_mock: aioresponses) -> None:
     pass
 
 

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

@@ -180,6 +180,7 @@ async def test_copying_large_project_and_retrieving_copy_task(
 
 @pytest.mark.parametrize(*_standard_user_role_response())
 async def test_creating_new_project_from_template_without_copying_data_creates_skeleton(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     logged_user: dict[str, Any],
     primary_group: dict[str, str],
@@ -230,6 +231,7 @@ async def test_creating_new_project_from_template_without_copying_data_creates_s
 
 @pytest.mark.parametrize(*_standard_user_role_response())
 async def test_creating_new_project_as_template_without_copying_data_creates_skeleton(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     logged_user: dict[str, Any],
     primary_group: dict[str, str],

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

@@ -412,6 +412,7 @@ async def test_get_project(
 
 @pytest.mark.parametrize(*standard_role_response())
 async def test_new_project(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     logged_user: UserInfoDict,
     primary_group,
@@ -427,6 +428,7 @@ async def test_new_project(
 
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_new_project_from_template(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     logged_user: UserInfoDict,
     primary_group: dict[str, str],
@@ -453,6 +455,7 @@ async def test_new_project_from_template(
 
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_new_project_from_other_study(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     logged_user: UserInfoDict,
     primary_group: dict[str, str],
@@ -482,6 +485,7 @@ async def test_new_project_from_other_study(
 
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_new_project_from_template_with_body(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     logged_user: UserInfoDict,
     primary_group: dict[str, str],
@@ -536,6 +540,7 @@ async def test_new_project_from_template_with_body(
 
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_new_template_from_project(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     logged_user: dict[str, Any],
     primary_group: dict[str, str],

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

@@ -54,6 +54,7 @@ async def _request_clone_project(client: TestClient, url: URL) -> ProjectGet:
 
 @pytest.mark.parametrize(*standard_role_response(), ids=str)
 async def test_clone_project_user_permissions(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,
@@ -85,6 +86,7 @@ async def test_clone_project_user_permissions(
     [UserRole.USER],
 )
 async def test_clone_project(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,

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

@@ -3,8 +3,9 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
+from collections.abc import Iterator
 from copy import deepcopy
-from typing import Any, Iterator
+from typing import Any
 
 import pytest
 import sqlalchemy as sa
@@ -88,6 +89,7 @@ async def _request_clone_project(client: TestClient, url: URL) -> ProjectGet:
     [UserRole.USER],
 )
 async def test_clone_project(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,

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

@@ -5,9 +5,8 @@
 # pylint: disable=unused-variable
 
 
-from collections.abc import Callable, Iterator
+from collections.abc import Awaitable, Callable, Iterator
 from http import HTTPStatus
-from typing import Awaitable
 from unittest import mock
 from unittest.mock import MagicMock, call
 

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

@@ -152,6 +152,7 @@ async def test_list_projects_with_invalid_pagination_parameters(
 @pytest.mark.parametrize("limit", [7, 20, 43])
 @pytest.mark.parametrize(*standard_user_role())
 async def test_list_projects_with_pagination(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     logged_user: dict[str, Any],
     primary_group: dict[str, str],
@@ -181,17 +182,17 @@ async def test_list_projects_with_pagination(
         next_link = None
         default_query_parameter = {"limit": limit}
         projects = []
-        for i in range(NUMBER_OF_CALLS):
+        for _ in range(NUMBER_OF_CALLS):
             print(
                 "calling in with query",
                 next_link.query if next_link else default_query_parameter,
             )
             data, meta, links = await _list_projects(
                 client,
                 expected.ok,
-                query_parameters=next_link.query
-                if next_link
-                else default_query_parameter,
+                query_parameters=(
+                    next_link.query if next_link else default_query_parameter
+                ),
             )
             print("...received [", meta, "]")
             assert len(data) == meta["count"]

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

@@ -114,6 +114,7 @@ async def _wait_until_deleted():
 
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_new_project_with_parent_project_node(
+    mock_dynamic_scheduler: None,
     # for deletion
     mocked_dynamic_services_interface: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,
@@ -191,6 +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(
+    mock_dynamic_scheduler: None,
     # for deletion
     mocked_dynamic_services_interface: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,
@@ -274,6 +276,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(
+    mock_dynamic_scheduler: None,
     # for deletion
     mocked_dynamic_services_interface: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,
@@ -393,6 +396,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(
+    mock_dynamic_scheduler: None,
     # for deletion
     mocked_dynamic_services_interface: dict[str, MagicMock],
     storage_subsystem_mock: MockedStorageSubsystem,

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

@@ -318,6 +318,7 @@ async def test_create_node_returns_422_if_body_is_missing(
 )
 @pytest.mark.parametrize(*standard_role_response(), ids=str)
 async def test_create_node(
+    mock_dynamic_scheduler: None,
     node_class: str,
     expect_run_service_call: bool,
     client: TestClient,
@@ -376,6 +377,7 @@ def standard_user_role() -> tuple[str, tuple]:
 
 @pytest.mark.parametrize(*standard_user_role())
 async def test_create_and_delete_many_nodes_in_parallel(
+    mock_dynamic_scheduler: None,
     disable_max_number_of_running_dynamic_nodes: dict[str, str],
     client: TestClient,
     user_project: ProjectDict,
@@ -395,8 +397,8 @@ class _RunningServices:
         running_services_uuids: list[str] = field(default_factory=list)
 
         def num_services(
-            self, *args, **kwargs
-        ) -> list[DynamicServiceGet]:  # noqa: ARG002
+            self, *args, **kwargs  # noqa: ARG002
+        ) -> list[DynamicServiceGet]:
             return [
                 DynamicServiceGet.model_validate(
                     DynamicServiceGet.model_config["json_schema_extra"]["examples"][1]
@@ -470,6 +472,7 @@ def inc_running_services(self, *args, **kwargs):  # noqa: ARG002
 
 @pytest.mark.parametrize(*standard_user_role())
 async def test_create_node_does_not_start_dynamic_node_if_there_are_already_too_many_running(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     user_project_with_num_dynamic_services: Callable[[int], Awaitable[ProjectDict]],
     expected: ExpectedResponse,
@@ -503,6 +506,7 @@ async def test_create_node_does_not_start_dynamic_node_if_there_are_already_too_
 
 @pytest.mark.parametrize(*standard_user_role())
 async def test_create_many_nodes_in_parallel_still_is_limited_to_the_defined_maximum(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     user_project_with_num_dynamic_services: Callable[[int], Awaitable[ProjectDict]],
     expected: ExpectedResponse,
@@ -524,8 +528,8 @@ class _RunninServices:
         running_services_uuids: list[str] = field(default_factory=list)
 
         async def num_services(
-            self, *args, **kwargs
-        ) -> list[dict[str, Any]]:  # noqa: ARG002
+            self, *args, **kwargs  # noqa: ARG002
+        ) -> list[dict[str, Any]]:
             return [
                 {"service_uuid": service_uuid}
                 for service_uuid in self.running_services_uuids
@@ -588,6 +592,7 @@ async def inc_running_services(self, *args, **kwargs):  # noqa: ARG002
 
 @pytest.mark.parametrize(*standard_user_role())
 async def test_create_node_does_start_dynamic_node_if_max_num_set_to_0(
+    mock_dynamic_scheduler: None,
     disable_max_number_of_running_dynamic_nodes: dict[str, str],
     client: TestClient,
     user_project_with_num_dynamic_services: Callable[[int], Awaitable[ProjectDict]],
@@ -625,6 +630,7 @@ async def test_create_node_does_start_dynamic_node_if_max_num_set_to_0(
 )
 @pytest.mark.parametrize(*standard_role_response(), ids=str)
 async def test_creating_deprecated_node_returns_406_not_acceptable(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     user_project: ProjectDict,
     expected: ExpectedResponse,
@@ -664,6 +670,7 @@ async def test_creating_deprecated_node_returns_406_not_acceptable(
 )
 @pytest.mark.parametrize(*standard_role_response(), ids=str)
 async def test_delete_node(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     logged_user: dict,
     user_project: ProjectDict,

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

@@ -65,6 +65,7 @@ def mock_catalog_rpc_check_for_service(mocker: MockerFixture):
     ],
 )
 async def test_patch_project_node_entrypoint_access(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,
@@ -86,6 +87,7 @@ async def test_patch_project_node_entrypoint_access(
     "user_role,expected", [(UserRole.USER, status.HTTP_204_NO_CONTENT)]
 )
 async def test_patch_project_node(
+    mock_dynamic_scheduler: None,
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,