fix tests

Author: bisgaard-itis

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

@@ -92,12 +92,12 @@ def mock_catalog_api(
 ) -> dict[str, mock.Mock]:
     return {
         "get_service_resources": mocker.patch(
-            "simcore_service_webserver.projects.projects_service.catalog_client.get_service_resources",
+            "simcore_service_webserver.projects.projects_service.catalog_service.get_service_resources",
             return_value=mock_service_resources,
             autospec=True,
         ),
         "get_service": mocker.patch(
-            "simcore_service_webserver.projects.projects_service.catalog_client.get_service",
+            "simcore_service_webserver.projects.projects_service.catalog_service.get_service",
             return_value=mock_service,
             autospec=True,
         ),

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

@@ -25,7 +25,7 @@
 @pytest.fixture
 def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
     mocker.patch(
-        "simcore_service_webserver.projects._crud_handlers.get_services_for_user_in_product",
+        "simcore_service_webserver.projects._crud_handlers.catalog_service.get_services_for_user_in_product",
         spec=True,
         return_value=[],
     )

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

@@ -20,7 +20,7 @@
 @pytest.fixture
 def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
     mocker.patch(
-        "simcore_service_webserver.projects._crud_handlers.get_services_for_user_in_product",
+        "simcore_service_webserver.projects._crud_handlers.catalog_service.get_services_for_user_in_product",
         spec=True,
         return_value=[],
     )
@@ -35,15 +35,6 @@ def mock_project_uses_available_services(mocker: MockerFixture):
     )
 
 
-@pytest.fixture
-def mock_catalog_api_get_services_for_user_in_product_2(mocker: MockerFixture):
-    mocker.patch(
-        "simcore_service_webserver.projects._crud_api_read.get_services_for_user_in_product",
-        spec=True,
-        return_value=[],
-    )
-
-
 @pytest.mark.acceptance_test(
     "Driving test for https://github.com/ITISFoundation/osparc-issues/issues/1547"
 )
@@ -55,7 +46,6 @@ async def test_projects_groups_full_workflow(
     expected: HTTPStatus,
     mock_catalog_api_get_services_for_user_in_product,
     mock_project_uses_available_services,
-    mock_catalog_api_get_services_for_user_in_product_2,
 ):
     assert client.app
     # check the default project permissions

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

@@ -479,7 +479,7 @@ async def test_get_project_services(
     ]
 
     mocker.patch(
-        "simcore_service_webserver.catalog._api.catalog_rpc.batch_get_my_services",
+        "simcore_service_webserver.catalog._service.catalog_rpc.batch_get_my_services",
         spec=True,
         return_value=[
             MyServiceGet(
@@ -561,7 +561,7 @@ async def test_get_project_services_service_unavailable(
     logged_user: UserInfoDict,
 ):
     mocker.patch(
-        "simcore_service_webserver.catalog._api.catalog_rpc.batch_get_my_services",
+        "simcore_service_webserver.catalog._service.catalog_rpc.batch_get_my_services",
         spec=True,
         side_effect=RPCServerError(
             exc_message="Service Unavailable",

services/web/server/tests/unit/with_dbs/03/resource_usage/test_admin_pricing_plans.py

@@ -23,7 +23,7 @@
 def mock_catalog_client(mocker: MockerFixture, faker: Faker) -> dict[str, MagicMock]:
     return {
         "get_service": mocker.patch(
-            "simcore_service_webserver.resource_usage._pricing_plans_admin_service.catalog_client.get_service",
+            "simcore_service_webserver.resource_usage._pricing_plans_admin_service.catalog_service.get_service",
             autospec=True,
         )
     }

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

@@ -283,7 +283,7 @@ def catalog_subsystem_mock(mocker: MockerFixture) -> None:
     ]
 
     mock = mocker.patch(
-        "simcore_service_webserver.projects._crud_api_read.get_services_for_user_in_product",
+        "simcore_service_webserver.projects._crud_api_read.catalog_service.get_services_for_user_in_product",
         autospec=True,
     )
 

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

@@ -27,12 +27,7 @@
 @pytest.fixture
 def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
     mocker.patch(
-        "simcore_service_webserver.projects._crud_api_read.get_services_for_user_in_product",
-        spec=True,
-        return_value=[],
-    )
-    mocker.patch(
-        "simcore_service_webserver.projects._crud_handlers.get_services_for_user_in_product",
+        "simcore_service_webserver.projects._crud_api_read.catalog_service.get_services_for_user_in_product",
         spec=True,
         return_value=[],
     )

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

@@ -23,12 +23,7 @@
 @pytest.fixture
 def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
     mocker.patch(
-        "simcore_service_webserver.projects._crud_api_read.get_services_for_user_in_product",
-        spec=True,
-        return_value=[],
-    )
-    mocker.patch(
-        "simcore_service_webserver.projects._crud_handlers.get_services_for_user_in_product",
+        "simcore_service_webserver.projects._crud_api_read.catalog_service.get_services_for_user_in_product",
         spec=True,
         return_value=[],
     )

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

@@ -28,12 +28,7 @@ def user_role() -> UserRole:
 @pytest.fixture
 def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
     mocker.patch(
-        "simcore_service_webserver.projects._crud_api_read.get_services_for_user_in_product",
-        spec=True,
-        return_value=[],
-    )
-    mocker.patch(
-        "simcore_service_webserver.projects._crud_handlers.get_services_for_user_in_product",
+        "simcore_service_webserver.projects._crud_api_read.catalog_service.get_services_for_user_in_product",
         spec=True,
         return_value=[],
     )