refactor: rename mocked_rpc_client to mocked_rabbit_rpc_client for clarity

Author: pcrespov

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

@@ -34,7 +34,7 @@ async def catalog_rpc_side_effect():
 
 
 @pytest.fixture
-def mocked_rpc_client(mocker: MockerFixture) -> MockType:
+def mocked_rabbit_rpc_client(mocker: MockerFixture) -> MockType:
     """This fixture mocks the RabbitMQRPCClient.request method which is used
     in all RPC clients in the api-server, regardeless of the namespace.
     """
@@ -62,6 +62,7 @@ async def _request(
 
         pytest.fail(f"Unexpected namespace {namespace} and method {method_name}")
 
+    # NOTE: mocks RabbitMQRPCClient.request(...)
     mock = mocker.MagicMock(spec=RabbitMQRPCClient)
     mock.request.side_effect = _request
 
@@ -70,31 +71,34 @@ async def _request(
 
 @pytest.fixture
 def wb_api_rpc_client(
-    mocked_rpc_client: MockType,
-    mocker: MockerFixture,
+    mocked_rabbit_rpc_client: MockType,
 ) -> WbApiRpcClient:
     from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
 
     return WbApiRpcClient(
-        _client=mocked_rpc_client, _rpc_client=mocker.MagicMock(spec=WebServerRpcClient)
+        _rpc_client=WebServerRpcClient(
+            mocked_rabbit_rpc_client, WEBSERVER_RPC_NAMESPACE
+        ),
     )
 
 
 @pytest.fixture
 def director_v2_rpc_client(
-    mocked_rpc_client: MockType,
+    mocked_rabbit_rpc_client: MockType,
 ) -> DirectorV2Service:
-    return DirectorV2Service(_rpc_client=mocked_rpc_client)
+    return DirectorV2Service(_rpc_client=mocked_rabbit_rpc_client)
 
 
 @pytest.fixture
 def storage_rpc_client(
-    mocked_rpc_client: MockType,
+    mocked_rabbit_rpc_client: MockType,
     user_id: UserID,
     product_name: ProductName,
 ) -> StorageService:
     return StorageService(
-        _rpc_client=mocked_rpc_client, _user_id=user_id, _product_name=product_name
+        _rpc_client=mocked_rabbit_rpc_client,
+        _user_id=user_id,
+        _product_name=product_name,
     )
 
 
@@ -129,12 +133,12 @@ def storage_rest_client(
 
 @pytest.fixture
 def catalog_service(
-    mocked_rpc_client: MockType,
+    mocked_rabbit_rpc_client: MockType,
     product_name: ProductName,
     user_id: UserID,
 ) -> CatalogService:
     return CatalogService(
-        _rpc_client=mocked_rpc_client, user_id=user_id, product_name=product_name
+        _rpc_client=mocked_rabbit_rpc_client, user_id=user_id, product_name=product_name
     )
 
 

services/api-server/tests/unit/service/test_service_catalog.py

@@ -31,7 +31,7 @@ def _to_solver_schema(
 async def test_catalog_service_read_solvers(
     product_name: ProductName,
     user_id: UserID,
-    mocked_rpc_client: MockType,
+    mocked_rabbit_rpc_client: MockType,
     catalog_service: CatalogService,
 ):
     # Step 1: List latest releases in a page
@@ -72,20 +72,20 @@ async def test_catalog_service_read_solvers(
     assert any(port.kind == "output" for port in ports), "Should contain output ports"
 
     # checks calls to rpc
-    assert mocked_rpc_client.request.call_count == 4
-    assert mocked_rpc_client.request.call_args_list[0].args == (
+    assert mocked_rabbit_rpc_client.request.call_count == 4
+    assert mocked_rabbit_rpc_client.request.call_args_list[0].args == (
         "catalog",
         "list_services_paginated",
     )
-    assert mocked_rpc_client.request.call_args_list[1].args == (
+    assert mocked_rabbit_rpc_client.request.call_args_list[1].args == (
         "catalog",
         "list_my_service_history_latest_first",
     )
-    assert mocked_rpc_client.request.call_args_list[2].args == (
+    assert mocked_rabbit_rpc_client.request.call_args_list[2].args == (
         "catalog",
         "get_service",
     )
-    assert mocked_rpc_client.request.call_args_list[3].args == (
+    assert mocked_rabbit_rpc_client.request.call_args_list[3].args == (
         "catalog",
         "get_service_ports",
     )

services/api-server/tests/unit/service/test_service_jobs.py

@@ -15,7 +15,7 @@
 
 
 async def test_list_jobs_by_resource_prefix(
-    mocked_rpc_client: MockType,
+    mocked_rabbit_rpc_client: MockType,
     job_service: JobService,
 ):
     # Test with default pagination parameters
@@ -26,7 +26,7 @@ async def test_list_jobs_by_resource_prefix(
     assert isinstance(jobs, list)
 
     assert len(jobs) == page_meta.count
-    assert mocked_rpc_client.request.call_args.args == (
+    assert mocked_rabbit_rpc_client.request.call_args.args == (
         "webserver",
         "list_projects_marked_as_jobs",
     )
@@ -38,7 +38,7 @@ async def test_list_jobs_by_resource_prefix(
 
 
 async def test_create_job(
-    mocked_rpc_client: MockType,
+    mocked_rabbit_rpc_client: MockType,
     job_service: JobService,
 ):
     # Create mock solver and inputs
@@ -81,7 +81,7 @@ def mock_url_for(*args, **kwargs):
     assert "test-solver" in job.name
 
     # Verify API calls
-    assert mocked_rpc_client.request.call_args.args == (
+    assert mocked_rabbit_rpc_client.request.call_args.args == (
         "webserver",
         "mark_project_as_job",
     )

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

@@ -27,7 +27,7 @@
 
 
 async def test_get_solver(
-    mocked_rpc_client: MockType,
+    mocked_rabbit_rpc_client: MockType,
     solver_service: SolverService,
     product_name: ProductName,
     user_id: UserID,
@@ -40,12 +40,12 @@ async def test_get_solver(
     assert isinstance(solver, Solver)
     assert solver.id == "simcore/services/comp/solver-1"
 
-    assert mocked_rpc_client.request.called
-    assert mocked_rpc_client.request.call_args.args == ("catalog", "get_service")
+    assert mocked_rabbit_rpc_client.request.called
+    assert mocked_rabbit_rpc_client.request.call_args.args == ("catalog", "get_service")
 
 
 async def test_list_jobs(
-    mocked_rpc_client: MockType,
+    mocked_rabbit_rpc_client: MockType,
     job_service: JobService,
 ):
     # Test default parameters
@@ -54,7 +54,7 @@ async def test_list_jobs(
     assert jobs
     assert len(jobs) == page_meta.count
 
-    assert mocked_rpc_client.request.call_args.args == (
+    assert mocked_rabbit_rpc_client.request.call_args.args == (
         "webserver",
         "list_projects_marked_as_jobs",
     )
@@ -66,7 +66,7 @@ async def test_list_jobs(
 
 
 async def test_solver_service_init_raises_configuration_error(
-    mocked_rpc_client: MockType,
+    mocked_rabbit_rpc_client: MockType,
     job_service: JobService,
     catalog_service: CatalogService,
     user_id: UserID,
@@ -81,11 +81,11 @@ async def test_solver_service_init_raises_configuration_error(
             product_name=invalid_product_name,
         )
     # Verify the RPC call was made to check consistency
-    assert not mocked_rpc_client.request.called
+    assert not mocked_rabbit_rpc_client.request.called
 
 
 async def test_job_service_get_job_success(
-    mocked_rpc_client: MockType,
+    mocked_rabbit_rpc_client: MockType,
     job_service: JobService,
 ):
     job_parent_resource_name = "solver-resource"
@@ -97,16 +97,16 @@ async def test_job_service_get_job_success(
     # Assert
     assert isinstance(result, ProjectJobRpcGet)
     assert result.job_parent_resource_name.startswith(job_parent_resource_name)
-    assert mocked_rpc_client.request.called
-    assert mocked_rpc_client.request.call_args.args == (
+    assert mocked_rabbit_rpc_client.request.called
+    assert mocked_rabbit_rpc_client.request.call_args.args == (
         "webserver",
         "get_project_marked_as_job",
     )
     assert (
-        mocked_rpc_client.request.call_args.kwargs["job_parent_resource_name"]
+        mocked_rabbit_rpc_client.request.call_args.kwargs["job_parent_resource_name"]
         == job_parent_resource_name
     )
-    assert mocked_rpc_client.request.call_args.kwargs["project_uuid"] == job_id
+    assert mocked_rabbit_rpc_client.request.call_args.kwargs["project_uuid"] == job_id
 
 
 @pytest.mark.parametrize(

services/api-server/tests/unit/service/test_service_studies.py

@@ -9,13 +9,13 @@
 
 
 async def test_list_jobs_no_study_id(
-    mocked_rpc_client: MockType, job_service: JobService
+    mocked_rabbit_rpc_client: MockType, job_service: JobService
 ):
     # Test with default parameters
     jobs, page_meta = await job_service.list_study_jobs()
 
     assert isinstance(jobs, list)
-    assert mocked_rpc_client.request.call_args.args == (
+    assert mocked_rabbit_rpc_client.request.call_args.args == (
         "webserver",
         "list_projects_marked_as_jobs",
     )
@@ -27,19 +27,21 @@ async def test_list_jobs_no_study_id(
 
     # Verify proper prefix was used
     assert (
-        mocked_rpc_client.request.call_args.kwargs[
+        mocked_rabbit_rpc_client.request.call_args.kwargs[
             "filters"
         ].job_parent_resource_name_prefix
         == "study"
     )
 
     # Check pagination parameters were passed correctly
-    assert mocked_rpc_client.request.call_args.kwargs["offset"] == page_meta.offset
-    assert mocked_rpc_client.request.call_args.kwargs["limit"] == page_meta.limit
+    assert (
+        mocked_rabbit_rpc_client.request.call_args.kwargs["offset"] == page_meta.offset
+    )
+    assert mocked_rabbit_rpc_client.request.call_args.kwargs["limit"] == page_meta.limit
 
 
 async def test_list_jobs_with_study_id(
-    mocked_rpc_client: MockType,
+    mocked_rabbit_rpc_client: MockType,
     job_service: JobService,
 ):
     # Test with a specific study ID
@@ -50,12 +52,14 @@ async def test_list_jobs_with_study_id(
 
     # Verify proper prefix was used with study ID
     assert (
-        mocked_rpc_client.request.call_args.kwargs[
+        mocked_rabbit_rpc_client.request.call_args.kwargs[
             "filters"
         ].job_parent_resource_name_prefix
         == f"study/{study_id}"
     )
 
     # Check pagination parameters were passed correctly
-    assert mocked_rpc_client.request.call_args.kwargs["offset"] == page_meta.offset
-    assert mocked_rpc_client.request.call_args.kwargs["limit"] == page_meta.limit
+    assert (
+        mocked_rabbit_rpc_client.request.call_args.kwargs["offset"] == page_meta.offset
+    )
+    assert mocked_rabbit_rpc_client.request.call_args.kwargs["limit"] == page_meta.limit