✨ Rename mocked_rpc_catalog_service_api to mocked_catalog_rpc_api for consistency across tests

Author: pcrespov

services/api-server/tests/unit/_with_db/test_product.py

@@ -80,7 +80,7 @@ def _check_key_product_compatibility(request: httpx.Request, **kwargs):
 
 async def test_product_catalog(
     client: httpx.AsyncClient,
-    mocked_rpc_catalog_service_api: dict[str, MockType],
+    mocked_catalog_rpc_api: dict[str, MockType],
     create_fake_api_keys: Callable[[PositiveInt], AsyncGenerator[ApiKeyInDB, None]],
 ) -> None:
     assert client
@@ -94,4 +94,4 @@ async def test_product_catalog(
             auth=httpx.BasicAuth(key.api_key, key.api_secret),
         )
 
-    assert mocked_rpc_catalog_service_api["get_service"].called
+    assert mocked_catalog_rpc_api["get_service"].called

services/api-server/tests/unit/api_solvers/test_api_routers_solvers_jobs.py

@@ -204,7 +204,7 @@ async def test_run_solver_job(
     client: httpx.AsyncClient,
     directorv2_service_openapi_specs: dict[str, Any],
     catalog_service_openapi_specs: dict[str, Any],
-    mocked_rpc_catalog_service_api: dict[str, MockType],
+    mocked_catalog_rpc_api: dict[str, MockType],
     mocked_directorv2_service_api: MockRouter,
     mocked_webserver_rest_api: MockRouter,
     mocked_webserver_rpc_api: dict[str, MockType],

services/api-server/tests/unit/api_solvers/test_api_routers_solvers_jobs_delete.py

@@ -125,7 +125,7 @@ async def test_create_and_delete_solver_job(
     client: httpx.AsyncClient,
     solver_key: str,
     solver_version: str,
-    mocked_rpc_catalog_service_api: dict[str, MockType],
+    mocked_catalog_rpc_api: dict[str, MockType],
     mocked_backend_services_apis_for_create_and_delete_solver_job: MockedBackendApiDict,
 ):
     # create Job
@@ -155,7 +155,7 @@ async def test_create_and_delete_solver_job(
     assert mock_webserver_router
     assert mock_webserver_router["delete_project"].called
 
-    get_service = mocked_rpc_catalog_service_api["get_service"]
+    get_service = mocked_catalog_rpc_api["get_service"]
     assert get_service
     assert get_service.called
 
@@ -175,7 +175,7 @@ async def test_create_job(
     solver_key: str,
     solver_version: str,
     mocked_backend_services_apis_for_create_and_delete_solver_job: MockedBackendApiDict,
-    mocked_rpc_catalog_service_api: dict[str, MockType],
+    mocked_catalog_rpc_api: dict[str, MockType],
     hidden: bool,
     parent_project_id: UUID | None,
     parent_node_id: UUID | None,

services/api-server/tests/unit/api_solvers/test_api_routers_solvers_jobs_metadata.py

@@ -39,7 +39,7 @@ def _as_path_regex(initial_path: str):
 def mocked_backend(
     mocked_webserver_rest_api: MockRouter,
     mocked_webserver_rpc_api: dict[str, MockType],
-    mocked_rpc_catalog_service_api: dict[str, MockType],
+    mocked_catalog_rpc_api: dict[str, MockType],
     project_tests_dir: Path,
 ) -> MockedBackendApiDict:
     mock_name = "for_test_get_and_update_job_metadata.json"

services/api-server/tests/unit/api_solvers/test_api_routers_solvers_jobs_read.py

@@ -25,7 +25,7 @@ class MockBackendRouters(NamedTuple):
 @pytest.fixture
 def mocked_backend(
     mocked_webserver_rest_api_base: MockRouter,
-    mocked_rpc_catalog_service_api: dict[str, MockType],
+    mocked_catalog_rpc_api: dict[str, MockType],
     project_tests_dir: Path,
 ) -> MockBackendRouters:
     mock_name = "on_list_jobs.json"
@@ -47,7 +47,7 @@ def mocked_backend(
 
     return MockBackendRouters(
         webserver=mocked_webserver_rest_api_base,
-        catalog=mocked_rpc_catalog_service_api,
+        catalog=mocked_catalog_rpc_api,
     )
 
 

services/api-server/tests/unit/conftest.py

@@ -60,58 +60,6 @@ def product_name() -> ProductName:
     return "osparc"
 
 
-@pytest.fixture
-def mocked_rpc_catalog_service_api(
-    app: FastAPI, mocker: MockerFixture
-) -> Iterable[dict[str, MockType]]:
-    """
-    Mocks the RPC catalog service API for testing purposes.
-    """
-
-    class MockRabbitMQRPCClient:
-        pass
-
-    def get_mock_rabbitmq_rpc_client():
-        return MockRabbitMQRPCClient()
-
-    app.dependency_overrides[get_rabbitmq_rpc_client] = get_mock_rabbitmq_rpc_client
-    side_effects = CatalogRpcSideEffects()
-
-    yield {
-        "list_services_paginated": mocker.patch.object(
-            catalog_rpc,
-            "list_services_paginated",
-            autospec=True,
-            side_effect=side_effects.list_services_paginated,
-        ),
-        "get_service": mocker.patch.object(
-            catalog_rpc,
-            "get_service",
-            autospec=True,
-            side_effect=side_effects.get_service,
-        ),
-        "update_service": mocker.patch.object(
-            catalog_rpc,
-            "update_service",
-            autospec=True,
-            side_effect=side_effects.update_service,
-        ),
-        "list_my_service_history_paginated": mocker.patch.object(
-            catalog_rpc,
-            "list_my_service_history_paginated",
-            autospec=True,
-            side_effect=side_effects.list_my_service_history_paginated,
-        ),
-        "get_service_ports": mocker.patch.object(
-            catalog_rpc,
-            "get_service_ports",
-            autospec=True,
-            side_effect=side_effects.get_service_ports,
-        ),
-    }
-    app.dependency_overrides.pop(get_rabbitmq_rpc_client)
-
-
 @pytest.fixture
 def app_environment(
     monkeypatch: pytest.MonkeyPatch,
@@ -282,7 +230,7 @@ def mocked_s3_server_url() -> Iterator[HttpUrl]:
     print(f"<-- stopped mock S3 server on {endpoint_url}")
 
 
-## MOCKED stack services --------------------------------------------------
+## MOCKED res/web APIs from simcore services ------------------------------------------
 
 
 @pytest.fixture
@@ -517,6 +465,63 @@ def mocked_catalog_rest_api_base(
         yield respx_mock
 
 
+@pytest.fixture
+def mocked_catalog_rpc_api(
+    app: FastAPI, mocker: MockerFixture
+) -> Iterable[dict[str, MockType]]:
+    """
+    Mocks the RPC catalog service API for testing purposes.
+    """
+
+    class MockRabbitMQRPCClient:
+        pass
+
+    def get_mock_rabbitmq_rpc_client():
+        return MockRabbitMQRPCClient()
+
+    app.dependency_overrides[get_rabbitmq_rpc_client] = get_mock_rabbitmq_rpc_client
+    side_effects = CatalogRpcSideEffects()
+
+    yield {
+        "list_services_paginated": mocker.patch.object(
+            catalog_rpc,
+            "list_services_paginated",
+            autospec=True,
+            side_effect=side_effects.list_services_paginated,
+        ),
+        "get_service": mocker.patch.object(
+            catalog_rpc,
+            "get_service",
+            autospec=True,
+            side_effect=side_effects.get_service,
+        ),
+        "update_service": mocker.patch.object(
+            catalog_rpc,
+            "update_service",
+            autospec=True,
+            side_effect=side_effects.update_service,
+        ),
+        "list_my_service_history_paginated": mocker.patch.object(
+            catalog_rpc,
+            "list_my_service_history_paginated",
+            autospec=True,
+            side_effect=side_effects.list_my_service_history_paginated,
+        ),
+        "get_service_ports": mocker.patch.object(
+            catalog_rpc,
+            "get_service_ports",
+            autospec=True,
+            side_effect=side_effects.get_service_ports,
+        ),
+    }
+    app.dependency_overrides.pop(get_rabbitmq_rpc_client)
+
+
+#
+# Other Mocks
+#
+
+
 @pytest.fixture
 def mocked_solver_job_outputs(mocker) -> None:
     result: dict[str, ResultsTypes] = {}

services/api-server/tests/unit/test_api_programs.py

@@ -24,7 +24,7 @@
 async def test_get_program_release(
     auth: httpx.BasicAuth,
     client: AsyncClient,
-    mocked_rpc_catalog_service_api: dict[str, MockType],
+    mocked_catalog_rpc_api: dict[str, MockType],
     mocker: MockerFixture,
     user_id: UserID,
 ):
@@ -48,7 +48,7 @@ async def test_create_program_job(
     auth: httpx.BasicAuth,
     client: AsyncClient,
     mocked_webserver_rest_api_base,
-    mocked_rpc_catalog_service_api: dict[str, MockType],
+    mocked_catalog_rpc_api: dict[str, MockType],
     create_respx_mock_from_capture: CreateRespxMockCallback,
     mocker: MockerFixture,
     user_id: UserID,

services/api-server/tests/unit/test_api_solvers.py

@@ -60,7 +60,7 @@ async def test_get_solver_pricing_plan(
 )
 async def test_get_latest_solver_release(
     client: AsyncClient,
-    mocked_rpc_catalog_service_api,
+    mocked_catalog_rpc_api,
     auth: httpx.BasicAuth,
     solver_key: str,
     expected_status_code: int,

services/api-server/tests/unit/test_service_solvers.py

@@ -16,7 +16,7 @@
 @pytest.fixture
 def solver_service(
     mocker: MockerFixture,
-    mocked_rpc_catalog_service_api: dict[str, MockType],
+    mocked_catalog_rpc_api: dict[str, MockType],
 ) -> SolverService:
     return SolverService(
         catalog_service=CatalogService(client=mocker.MagicMock()),
@@ -26,7 +26,7 @@ def solver_service(
 
 async def test_get_solver(
     solver_service: SolverService,
-    mocked_rpc_catalog_service_api: dict[str, MockType],
+    mocked_catalog_rpc_api: dict[str, MockType],
     product_name: ProductName,
     user_id: UserID,
 ):
@@ -38,4 +38,4 @@ async def test_get_solver(
     )
 
     assert isinstance(solver, Solver)
-    mocked_rpc_catalog_service_api["get_service"].assert_called_once()
+    mocked_catalog_rpc_api["get_service"].assert_called_once()

services/api-server/tests/unit/test_services_catalog.py

@@ -34,7 +34,7 @@ async def test_catalog_service_read_solvers(
     product_name: ProductName,
     user_id: UserID,
     mocker: MockerFixture,
-    mocked_rpc_catalog_service_api: dict[str, MockType],
+    mocked_catalog_rpc_api: dict[str, MockType],
 ):
     catalog_service = CatalogService(client=mocker.MagicMock())
 
@@ -84,9 +84,7 @@ async def test_catalog_service_read_solvers(
     assert any(port.kind == "output" for port in ports), "Should contain output ports"
 
     # checks calls to rpc
-    mocked_rpc_catalog_service_api["list_services_paginated"].assert_called_once()
-    mocked_rpc_catalog_service_api[
-        "list_my_service_history_paginated"
-    ].assert_called_once()
-    mocked_rpc_catalog_service_api["get_service"].assert_called_once()
-    mocked_rpc_catalog_service_api["get_service_ports"].assert_called_once()
+    mocked_catalog_rpc_api["list_services_paginated"].assert_called_once()
+    mocked_catalog_rpc_api["list_my_service_history_paginated"].assert_called_once()
+    mocked_catalog_rpc_api["get_service"].assert_called_once()
+    mocked_catalog_rpc_api["get_service_ports"].assert_called_once()