fixes test

Author: pcrespov

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

@@ -683,11 +683,11 @@ def mocked_catalog_rpc_api(
     """
     Mocks the catalog's simcore service RPC API for testing purposes.
     """
-    from servicelib.rabbitmq.rpc_interfaces.catalog import (
-        services as catalog_rpc,  # keep import here
+    from servicelib.rabbitmq.rpc_interfaces.catalog import (  # noqa: PLC0415; keep import here
+        services as catalog_rpc,
     )
 
-    mocks = {}
+    mocks: dict[str, MockType] = {}
 
     # Get all callable methods from the side effects class that are not built-ins
     side_effect_methods = [
@@ -726,8 +726,8 @@ def mocked_directorv2_rpc_api(
     """
     Mocks the director-v2's simcore service RPC API for testing purposes.
     """
-    from servicelib.rabbitmq.rpc_interfaces.director_v2 import (
-        computations_tasks as directorv2_rpc,  # keep import here
+    from servicelib.rabbitmq.rpc_interfaces.director_v2 import (  # noqa: PLC0415; keep import here
+        computations_tasks as directorv2_rpc,
     )
 
     mocks = {}

services/api-server/tests/unit/pact_broker/test_pact_checkout_release.py

@@ -18,13 +18,9 @@
 from simcore_service_api_server.api.dependencies.resource_usage_tracker_rpc import (
     get_resource_usage_tracker_client,
 )
-from simcore_service_api_server.api.dependencies.webserver_rpc import (
-    get_wb_api_rpc_client,
-)
 from simcore_service_api_server.services_rpc.resource_usage_tracker import (
     ResourceUsageTrackerClient,
 )
-from simcore_service_api_server.services_rpc.wb_api_server import WbApiRpcClient
 
 # Fake response based on values from 01_checkout_release.json
 EXPECTED_CHECKOUT = LicensedItemCheckoutRpcGet.model_validate(
@@ -64,14 +60,9 @@
 @pytest.fixture
 async def mock_wb_api_server_rpc(
     app: FastAPI,
-    mocker: MockerFixture,
+    mocked_app_rpc_dependencies: None,
     mock_handler_in_licenses_rpc_interface: HandlerMockFactory,
 ) -> None:
-    from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
-
-    app.dependency_overrides[get_wb_api_rpc_client] = lambda: WbApiRpcClient(
-        _rpc_client=mocker.MagicMock(spec=WebServerRpcClient),
-    )
 
     mock_handler_in_licenses_rpc_interface(
         "checkout_licensed_item_for_wallet", return_value=EXPECTED_CHECKOUT
@@ -84,6 +75,7 @@ async def mock_wb_api_server_rpc(
 
 @pytest.fixture
 async def mock_rut_server_rpc(app: FastAPI, mocker: MockerFixture) -> None:
+    import simcore_service_api_server.services_rpc.resource_usage_tracker
     from servicelib.rabbitmq import RabbitMQRPCClient
 
     app.dependency_overrides[get_resource_usage_tracker_client] = (
@@ -92,8 +84,9 @@ async def mock_rut_server_rpc(app: FastAPI, mocker: MockerFixture) -> None:
         )
     )
 
-    mocker.patch(
-        "simcore_service_api_server.services_rpc.resource_usage_tracker._get_licensed_item_checkout",
+    mocker.patch.object(
+        simcore_service_api_server.services_rpc.resource_usage_tracker,
+        "_get_licensed_item_checkout",
         return_value=EXPECTED_CHECKOUT,
     )
 
@@ -102,7 +95,7 @@ async def mock_rut_server_rpc(app: FastAPI, mocker: MockerFixture) -> None:
     not os.getenv("PACT_BROKER_URL"),
     reason="This test runs only if PACT_BROKER_URL is provided",
 )
-def test_provider_against_pact(
+def test_osparc_api_server_checkout_release_pact(
     pact_broker_credentials: tuple[str, str, str],
     mock_wb_api_server_rpc: None,
     mock_rut_server_rpc: None,

services/api-server/tests/unit/pact_broker/test_pact_licensed_items.py

@@ -150,7 +150,7 @@ async def mock_wb_api_server_rpc(
     not os.getenv("PACT_BROKER_URL"),
     reason="This test runs only if PACT_BROKER_URL is provided",
 )
-def test_provider_against_pact(
+def test_osparc_api_server_licensed_items_pact(
     pact_broker_credentials: tuple[str, str, str],
     mock_wb_api_server_rpc: None,
     running_test_server_url: str,