fix tests

Author: matusdrobuliak66

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

@@ -97,13 +97,11 @@ async def test_copying_large_project_and_aborting_correctly_removes_new_project(
     standard_groups: list[dict[str, str]],
     user_project: dict[str, Any],
     expected: ExpectedResponse,
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     slow_storage_subsystem_mock: MockedStorageSubsystem,
     project_db_cleaner: None,
     mocked_dynamic_services_interface: dict[str, MagicMock],
 ):
     assert client.app
-    catalog_subsystem_mock([user_project])
     # initiate a project copy that will last long (simulated by a long running storage)
     # POST /v0/projects
     create_url = client.app.router["create_project"].url_for()
@@ -150,13 +148,11 @@ async def test_copying_large_project_and_retrieving_copy_task(
     standard_groups: list[dict[str, str]],
     user_project: dict[str, Any],
     expected: ExpectedResponse,
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     slow_storage_subsystem_mock: MockedStorageSubsystem,
     project_db_cleaner: None,
     mocked_dynamic_services_interface: dict[str, MagicMock],
 ):
     assert client.app
-    catalog_subsystem_mock([user_project])
 
     # initiate a project copy that will last long (simulated by a long running storage)
     # POST /v0/projects
@@ -198,13 +194,11 @@ async def test_creating_new_project_from_template_without_copying_data_creates_s
     standard_groups: list[dict[str, str]],
     template_project: dict[str, Any],
     expected: ExpectedResponse,
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     slow_storage_subsystem_mock: MockedStorageSubsystem,
     project_db_cleaner: None,
     request_create_project: Callable[..., Awaitable[ProjectDict]],
 ):
     assert client.app
-    catalog_subsystem_mock([template_project])
     # create a project from another without copying data shall not call in the storage API
     # POST /v0/projects
     await request_create_project(
@@ -249,13 +243,11 @@ async def test_creating_new_project_as_template_without_copying_data_creates_ske
     standard_groups: list[dict[str, str]],
     user_project: dict[str, Any],
     expected: ExpectedResponse,
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     slow_storage_subsystem_mock: MockedStorageSubsystem,
     project_db_cleaner: None,
     request_create_project: Callable[..., Awaitable[ProjectDict]],
 ):
     assert client.app
-    catalog_subsystem_mock([user_project])
     # create a project from another without copying data shall not call in the storage API
     # POST /v0/projects
     await request_create_project(

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

@@ -194,10 +194,8 @@ async def test_list_projects(
     user_project: dict[str, Any],
     template_project: dict[str, Any],
     expected: HTTPStatus,
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     director_v2_service_mock: aioresponses,
 ):
-    catalog_subsystem_mock([user_project, template_project])
     data, *_ = await _list_and_assert_projects(client, expected)
 
     if data:
@@ -344,7 +342,6 @@ async def test_list_projects_with_innaccessible_services(
     user_project: dict[str, Any],
     template_project: dict[str, Any],
     expected: HTTPStatus,
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     director_v2_service_mock: aioresponses,
     postgres_db: sa.engine.Engine,
     s4l_product_headers: dict[str, Any],
@@ -374,7 +371,6 @@ async def test_list_projects_with_innaccessible_services(
 
     # use-case 4: give user access to services
     # shall return the projects for any product
-    catalog_subsystem_mock([user_project, template_project])
     data, *_ = await _list_and_assert_projects(
         client, expected, headers=s4l_product_headers
     )
@@ -403,10 +399,7 @@ async def test_get_project(
     user_project: ProjectDict,
     template_project: ProjectDict,
     expected,
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
 ):
-    catalog_subsystem_mock([user_project, template_project])
-
     # standard project
     await _assert_get_same_project(client, user_project, expected)
 
@@ -444,7 +437,6 @@ async def test_create_get_and_patch_project_ui_field(
     logged_user: UserInfoDict,
     primary_group: dict[str, str],
     request_create_project: Callable[..., Awaitable[ProjectDict]],
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     project_db_cleaner,
 ):
     assert client.app
@@ -462,8 +454,6 @@ async def test_create_get_and_patch_project_ui_field(
     )
     project_id = new_project["uuid"]
 
-    catalog_subsystem_mock([new_project])
-
     # Step 2: Get the project and check the ui.icon
     url = client.app.router["get_project"].url_for(project_id=project_id)
     resp = await client.get(f"{url}")
@@ -522,11 +512,9 @@ async def test_new_project_from_other_study(
     user_project: ProjectDict,
     expected: ExpectedResponse,
     storage_subsystem_mock,
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     project_db_cleaner,
     request_create_project: Callable[..., Awaitable[ProjectDict]],
 ):
-    catalog_subsystem_mock([user_project])
     new_project = await request_create_project(
         client,
         expected.accepted,
@@ -608,7 +596,6 @@ async def test_new_template_from_project(
     user_project: dict[str, Any],
     expected: ExpectedResponse,
     storage_subsystem_mock: MockedStorageSubsystem,
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     project_db_cleaner: None,
     request_create_project: Callable[..., Awaitable[ProjectDict]],
 ):
@@ -625,7 +612,6 @@ async def test_new_template_from_project(
 
     if new_template_prj:
         template_project = new_template_prj
-        catalog_subsystem_mock([template_project])
 
         templates, *_ = await _list_and_assert_projects(
             client, status.HTTP_200_OK, {"type": "template"}

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

@@ -61,7 +61,6 @@ async def test_delete_project(
     expected: ExpectedResponse,
     storage_subsystem_mock: MockedStorageSubsystem,
     mocked_dynamic_services_interface: dict[str, MagicMock],
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     fake_services: Callable[..., Awaitable[list[DynamicServiceGet]]],
     assert_get_same_project_caller: Callable,
     mock_dynamic_scheduler_rabbitmq: None,

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

@@ -133,7 +133,6 @@ async def test_list_projects_with_invalid_pagination_parameters(
     primary_group: dict[str, str],
     expected: ExpectedResponse,
     storage_subsystem_mock,
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     director_v2_service_mock: aioresponses,
     project_db_cleaner,
     limit: int,
@@ -158,7 +157,6 @@ async def test_list_projects_with_pagination(
     primary_group: dict[str, str],
     expected: ExpectedResponse,
     storage_subsystem_mock,
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     director_v2_service_mock: aioresponses,
     project_db_cleaner,
     limit: int,
@@ -175,7 +173,6 @@ async def test_list_projects_with_pagination(
         ]
     )
     if expected.created == status.HTTP_201_CREATED:
-        catalog_subsystem_mock(created_projects)
 
         assert len(created_projects) == NUM_PROJECTS
         NUMBER_OF_CALLS = ceil(NUM_PROJECTS / limit)

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

@@ -122,12 +122,10 @@ async def test_new_project_with_parent_project_node(
     primary_group: dict[str, str],
     user_project: ProjectDict,
     expected: ExpectedResponse,
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     request_create_project: Callable[..., Awaitable[ProjectDict]],
     aiopg_engine: aiopg.sa.Engine,
 ):
     """this is new way of setting parents by using request headers"""
-    catalog_subsystem_mock([user_project])
     parent_project = await request_create_project(
         client,
         expected.accepted,
@@ -199,13 +197,11 @@ async def test_new_project_with_invalid_parent_project_node(
     primary_group: dict[str, str],
     user_project: ProjectDict,
     expected: ExpectedResponse,
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     request_create_project: Callable[..., Awaitable[ProjectDict]],
     aiopg_engine: aiopg.sa.Engine,
     faker: Faker,
 ):
     """this is new way of setting parents by using request headers"""
-    catalog_subsystem_mock([user_project])
     parent_project = await request_create_project(
         client,
         expected.accepted,

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

@@ -277,7 +277,6 @@ async def test_share_project(
     expected: ExpectedResponse,
     storage_subsystem_mock,
     mocked_dynamic_services_interface: dict[str, mock.Mock],
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
     share_rights: dict,
     project_db_cleaner,
     request_create_project: Callable[..., Awaitable[ProjectDict]],

services/web/server/tests/unit/with_dbs/03/tags/test_tags.py

@@ -4,7 +4,7 @@
 # pylint: disable=too-many-arguments
 
 
-from collections.abc import AsyncIterator, Callable, Iterator
+from collections.abc import AsyncIterator, Iterator
 from typing import Any
 
 import pytest
@@ -52,9 +52,7 @@ async def test_tags_to_studies(
     client: TestClient,
     faker: Faker,
     user_project: ProjectDict,
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
 ):
-    catalog_subsystem_mock([user_project])
     assert client.app
 
     # Add test tags

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

@@ -7,7 +7,7 @@
 
 
 import logging
-from collections.abc import AsyncIterable, Callable
+from collections.abc import AsyncIterable
 from pathlib import Path
 
 import pytest
@@ -72,19 +72,15 @@ async def other_user_project(
 @pytest.fixture
 def mocked_catalog(
     user_project: ProjectDict,
-    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
-):
-    catalog_subsystem_mock([user_project])
+): ...
 
 
 @pytest.fixture
-def mocked_director_v2(director_v2_service_mock: aioresponses):
-    ...
+def mocked_director_v2(director_v2_service_mock: aioresponses): ...
 
 
 @pytest.fixture
-def mocked_storage(storage_subsystem_mock: MockedStorageSubsystem):
-    ...
+def mocked_storage(storage_subsystem_mock: MockedStorageSubsystem): ...
 
 
 @pytest.fixture

services/web/server/tests/unit/with_dbs/03/trash/test_trash_rest.py

@@ -587,7 +587,6 @@ async def test_trash_workspace(
     workspace: WorkspaceGet,
     user_project: ProjectDict,
     fake_project: ProjectDict,
-    mocked_catalog: None,
     mocked_dynamic_services_interface: dict[str, MagicMock],
     postgres_db: sa.engine.Engine,
 ):
@@ -843,7 +842,6 @@ async def test_trash_subfolder(
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,
-    mocked_catalog: None,
     mocked_dynamic_services_interface: dict[str, MagicMock],
 ):
     assert client.app
@@ -941,7 +939,6 @@ async def test_trash_project_in_subfolder(
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,
-    mocked_catalog: None,
     mocked_dynamic_services_interface: dict[str, MagicMock],
 ):
     assert client.app
@@ -1030,7 +1027,6 @@ async def test_trash_project_explitictly_and_empty_trash_bin(
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,
-    mocked_catalog: None,
     mocked_director_v2: None,
     mocked_dynamic_services_interface: dict[str, MagicMock],
     mocked_storage: None,
@@ -1088,7 +1084,6 @@ async def test_trash_folder_with_subfolder_and_project_and_empty_bin(
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,
-    mocked_catalog: None,
     mocked_director_v2: None,
     mocked_dynamic_services_interface: dict[str, MagicMock],
     mocked_storage: None,

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

@@ -390,7 +390,6 @@ async def test_dispatch_study_anonymously(
     redirect_type: str,
     mocker: MockerFixture,
     storage_subsystem_mock,
-    catalog_subsystem_mock: None,
     mocks_on_projects_api,
 ):
     assert client.app
@@ -456,7 +455,6 @@ async def test_dispatch_logged_in_user(
     mocker: MockerFixture,
     mock_dynamic_scheduler: None,
     storage_subsystem_mock,
-    catalog_subsystem_mock: None,
     mocks_on_projects_api: None,
 ):
     assert client.app