fix tests

Author: matusdrobuliak66

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

@@ -189,42 +189,6 @@ def is_graph_equal(
     return True
 
 
-def are_project_services_available(
-    project: dict[str, Any], available_services: list[dict[str, str]]
-) -> bool:
-    if not project["workbench"]:
-        # empty project
-        return True
-
-    # list services in project
-    needed_services = {
-        (srv["key"], srv["version"]) for _, srv in project["workbench"].items()
-    }
-
-    # list available services
-    available_services_set = {
-        (srv["key"], srv["version"]) for srv in available_services
-    }
-
-    return needed_services.issubset(available_services_set)
-
-
-def get_project_unavailable_services(
-    project: dict[str, Any], available_services: list[dict[str, Any]]
-) -> set[tuple[str, str]]:
-    # get project services
-    required: set[tuple[str, str]] = {
-        (s["key"], s["version"]) for _, s in project["workbench"].items()
-    }
-
-    # get available services
-    available: set[tuple[str, str]] = {
-        (s["key"], s["version"]) for s in available_services
-    }
-
-    return required - available
-
-
 def extract_dns_without_default_port(url: URL) -> str:
     port = "" if url.port == 80 else f":{url.port}"
     return f"{url.host}{port}"

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

@@ -19,7 +19,6 @@
 from models_library.projects import ProjectID, ProjectTemplateType
 from models_library.users import UserID
 from pydantic import BaseModel, PositiveInt
-from pytest_mock import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.webserver_login import UserInfoDict
 from pytest_simcore.helpers.webserver_parametrizations import (
@@ -53,15 +52,6 @@ def standard_and_tester_user_roles() -> tuple[str, tuple[UserRole, ExpectedRespo
     )
 
 
-@pytest.fixture
-def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
-    mocker.patch(
-        "simcore_service_webserver.projects._crud_api_read.catalog_service.get_services_for_user_in_product",
-        spec=True,
-        return_value=[],
-    )
-
-
 async def _new_project(
     client: TestClient,
     user_id: UserID,
@@ -119,7 +109,6 @@ async def test_list_projects_with_search_parameter(
     tests_data_dir: Path,
     osparc_product_name: str,
     project_db_cleaner: None,
-    mock_catalog_api_get_services_for_user_in_product,
 ):
     projects_info = [
         _ProjectInfo(
@@ -309,7 +298,6 @@ async def test_list_projects_with_order_by_parameter(
     tests_data_dir: Path,
     osparc_product_name: str,
     project_db_cleaner: None,
-    mock_catalog_api_get_services_for_user_in_product: None,
 ):
     projects_info = [
         _ProjectInfo(
@@ -449,7 +437,6 @@ async def test_list_projects_for_specific_folder_id(
     tests_data_dir: Path,
     osparc_product_name: str,
     project_db_cleaner: None,
-    mock_catalog_api_get_services_for_user_in_product: None,
     setup_folders_db: FolderID,
 ):
     projects_info = [
@@ -532,7 +519,6 @@ async def test_list_and_patch_projects_with_template_type(
     tests_data_dir: Path,
     osparc_product_name: str,
     project_db_cleaner: None,
-    mock_catalog_api_get_services_for_user_in_product,
 ):
     projects_type = [
         "STANDARD",

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

@@ -11,7 +11,6 @@
 
 import pytest
 from aiohttp.test_utils import TestClient
-from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.webserver_login import UserInfoDict
 from servicelib.aiohttp import status
@@ -22,24 +21,6 @@
 API_PREFIX = "/" + api_version_prefix
 
 
-@pytest.fixture
-def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
-    mocker.patch(
-        "simcore_service_webserver.projects._controller.projects_rest.catalog_service.get_services_for_user_in_product",
-        spec=True,
-        return_value=[],
-    )
-
-
-@pytest.fixture
-def mock_are_project_services_available(mocker: MockerFixture):
-    mocker.patch(
-        "simcore_service_webserver.projects._controller.projects_rest.are_project_services_available",
-        spec=True,
-        return_value=True,
-    )
-
-
 @pytest.mark.parametrize(
     "user_role,expected",
     [
@@ -81,8 +62,6 @@ async def test_patch_project(
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,
-    mock_catalog_api_get_services_for_user_in_product,
-    mock_are_project_services_available,
 ):
     assert client.app
     base_url = client.app.router["patch_project"].url_for(

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

@@ -12,35 +12,13 @@
 from models_library.api_schemas_webserver.projects_access_rights import (
     ProjectShareAccepted,
 )
-from pytest_mock import MockType
-from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
 from servicelib.aiohttp import status
 from simcore_service_webserver.db.models import UserRole
 from simcore_service_webserver.projects.models import ProjectDict
 
 
-@pytest.fixture
-def mock_catalog_api_get_services_for_user_in_product(
-    mocker: MockerFixture,
-) -> MockType:
-    return mocker.patch(
-        "simcore_service_webserver.projects._controller.projects_rest.catalog_service.get_services_for_user_in_product",
-        spec=True,
-        return_value=[],
-    )
-
-
-@pytest.fixture
-def mock_are_project_services_available(mocker: MockerFixture) -> MockType:
-    return mocker.patch(
-        "simcore_service_webserver.projects._controller.projects_rest.are_project_services_available",
-        spec=True,
-        return_value=True,
-    )
-
-
 @pytest.mark.acceptance_test(
     "Driving test for https://github.com/ITISFoundation/osparc-issues/issues/1547"
 )
@@ -50,8 +28,6 @@ async def test_projects_groups_full_workflow(  # noqa: PLR0915
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,
-    mock_catalog_api_get_services_for_user_in_product: MockType,
-    mock_are_project_services_available: MockType,
 ):
     assert client.app
     # check the default project permissions
@@ -264,8 +240,6 @@ async def test_share_project(
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,
-    mock_catalog_api_get_services_for_user_in_product: MockType,
-    mock_are_project_services_available: MockType,
 ):
     assert client.app
 
@@ -332,8 +306,6 @@ async def test_share_project_with_roles(
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,
-    mock_catalog_api_get_services_for_user_in_product: MockType,
-    mock_are_project_services_available: MockType,
     user_role: UserRole,
     expected_status: HTTPStatus,
 ):

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

@@ -26,24 +26,6 @@
 API_PREFIX = "/" + api_version_prefix
 
 
-@pytest.fixture
-def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
-    mocker.patch(
-        "simcore_service_webserver.projects._controller.projects_rest.catalog_service.get_services_for_user_in_product",
-        spec=True,
-        return_value=[],
-    )
-
-
-@pytest.fixture
-def mock_are_project_services_available(mocker: MockerFixture):
-    mocker.patch(
-        "simcore_service_webserver.projects._controller.projects_rest.are_project_services_available",
-        spec=True,
-        return_value=True,
-    )
-
-
 @pytest.fixture
 def mock_catalog_rpc_check_for_service(mocker: MockerFixture):
     mocker.patch(
@@ -99,8 +81,6 @@ async def test_patch_project_node(
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,
-    mock_catalog_api_get_services_for_user_in_product: None,
-    mock_are_project_services_available: None,
     mock_catalog_rpc_check_for_service: None,
 ):
     node_id = next(iter(user_project["workbench"]))
@@ -221,8 +201,6 @@ async def test_patch_project_node_notifies(
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,
-    mock_catalog_api_get_services_for_user_in_product,
-    mock_are_project_services_available,
     mock_catalog_rpc_check_for_service,
     mocked_notify_project_node_update,
 ):
@@ -257,8 +235,6 @@ async def test_patch_project_node_inputs_notifies(
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,
-    mock_catalog_api_get_services_for_user_in_product,
-    mock_are_project_services_available,
     mocked_notify_project_node_update,
 ):
     node_id = next(iter(user_project["workbench"]))
@@ -297,8 +273,6 @@ async def test_patch_project_node_inputs_with_data_type_change(
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,
-    mock_catalog_api_get_services_for_user_in_product,
-    mock_are_project_services_available,
 ):
     node_id = next(iter(user_project["workbench"]))
     assert client.app
@@ -350,8 +324,6 @@ async def test_patch_project_node_service_key_with_error(
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,
-    mock_catalog_api_get_services_for_user_in_product,
-    mock_are_project_services_available,
     mocker: MockerFixture,
 ):
     node_id = next(iter(user_project["workbench"]))

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

@@ -269,22 +269,12 @@ async def test_project_folder_movement_full_workflow(
     await assert_status(resp, status.HTTP_204_NO_CONTENT)
 
 
-@pytest.fixture
-def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
-    mocker.patch(
-        "simcore_service_webserver.projects._crud_api_read.catalog_service.get_services_for_user_in_product",
-        spec=True,
-        return_value=[],
-    )
-
-
 @pytest.mark.parametrize("user_role,expected", [(UserRole.USER, status.HTTP_200_OK)])
 async def test_project_listing_inside_of_private_folder(
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,
-    mock_catalog_api_get_services_for_user_in_product: MockerFixture,
 ):
     assert client.app
 
@@ -404,7 +394,6 @@ async def test_folders_deletion(
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,
-    mock_catalog_api_get_services_for_user_in_product: MockerFixture,
     mock_storage_delete_data_folders: mock.Mock,
 ):
     assert client.app

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

@@ -5,7 +5,6 @@
 
 import pytest
 import sqlalchemy as sa
-from pytest_mock import MockerFixture
 from simcore_postgres_database.models.projects import projects
 from simcore_postgres_database.models.workspaces import workspaces
 
@@ -16,17 +15,3 @@ def workspaces_clean_db(postgres_db: sa.engine.Engine) -> Iterator[None]:
         yield
         con.execute(workspaces.delete())
         con.execute(projects.delete())
-
-
-@pytest.fixture
-def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
-    mocker.patch(
-        "simcore_service_webserver.projects._crud_api_read.catalog_service.get_services_for_user_in_product",
-        spec=True,
-        return_value=[],
-    )
-    mocker.patch(
-        "simcore_service_webserver.projects._controller.projects_rest.are_project_services_available",
-        spec=True,
-        return_value=True,
-    )

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

@@ -11,7 +11,6 @@
 from aiohttp.test_utils import TestClient
 from models_library.api_schemas_webserver.workspaces import WorkspaceGet
 from models_library.rest_ordering import OrderDirection
-from pytest_mock import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.webserver_login import UserInfoDict
 from pytest_simcore.helpers.webserver_parametrizations import (
@@ -64,7 +63,6 @@ async def test_workspaces_workflow(
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,
-    mock_catalog_api_get_services_for_user_in_product: MockerFixture,
     workspaces_clean_db: AsyncIterator[None],
 ):
     assert client.app

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

@@ -47,7 +47,6 @@ async def test_workspaces_full_workflow_deletion(
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,
-    mock_catalog_api_get_services_for_user_in_product: MockerFixture,
     fake_project: ProjectDict,
     workspaces_clean_db: None,
     mock_storage_delete_data_folders: mock.Mock,

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

@@ -28,7 +28,6 @@ async def test_workspaces_full_workflow_with_folders_and_projects(
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,
-    mock_catalog_api_get_services_for_user_in_product: MockerFixture,
     fake_project: ProjectDict,
     workspaces_clean_db: None,
 ):
@@ -257,7 +256,6 @@ async def test_workspaces_delete_folders(
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,
-    mock_catalog_api_get_services_for_user_in_product: MockerFixture,
     fake_project: ProjectDict,
     workspaces_clean_db: None,
     mock_storage_delete_data_folders: mock.Mock,
@@ -367,7 +365,6 @@ async def test_listing_folders_and_projects_in_workspace__multiple_workspaces_cr
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,
-    mock_catalog_api_get_services_for_user_in_product: MockerFixture,
     fake_project: ProjectDict,
     workspaces_clean_db: None,
 ):