fix: update RPC namespace from 'webserver' to 'wb-api-server' in job tests

Author: pcrespov

services/api-server/tests/unit/api_functions/celery/test_functions_celery.py

@@ -41,6 +41,7 @@
 from models_library.users import UserID
 from pytest_mock import MockerFixture, MockType
 from pytest_simcore.helpers.httpx_calls_capture_models import HttpApiCallCaptureModel
+from pytest_simcore.helpers.typing_mock import HandlerMockFactory
 from servicelib.celery.models import ExecutionMetadata, TaskID, TasksQueue
 from servicelib.common_headers import (
     X_SIMCORE_PARENT_NODE_ID,
@@ -165,9 +166,7 @@ async def test_with_fake_run_function(
     auth: BasicAuth,
     mocker: MockerFixture,
     with_api_server_celery_worker: TestWorkController,
-    mock_handler_in_functions_rpc_interface: Callable[
-        [str, Any, Exception | None, Callable | None], None
-    ],
+    mock_handler_in_functions_rpc_interface: HandlerMockFactory,
     fake_registered_project_function: RegisteredProjectFunction,
     fake_registered_project_function_job: RegisteredFunctionJob,
     user_id: UserID,
@@ -316,9 +315,7 @@ async def test_run_project_function_parent_info(
     app: FastAPI,
     with_api_server_celery_worker: TestWorkController,
     client: AsyncClient,
-    mock_handler_in_functions_rpc_interface: Callable[
-        [str, Any, Exception | None, Callable | None], None
-    ],
+    mock_handler_in_functions_rpc_interface: HandlerMockFactory,
     fake_registered_project_function: RegisteredProjectFunction,
     fake_registered_project_function_job: RegisteredFunctionJob,
     auth: httpx.BasicAuth,
@@ -432,9 +429,7 @@ async def test_map_function_parent_info(
     app: FastAPI,
     with_api_server_celery_worker: TestWorkController,
     client: AsyncClient,
-    mock_handler_in_functions_rpc_interface: Callable[
-        [str, Any, Exception | None, Callable | None], MockType
-    ],
+    mock_handler_in_functions_rpc_interface: HandlerMockFactory,
     fake_registered_project_function: RegisteredProjectFunction,
     fake_registered_project_function_job: RegisteredFunctionJob,
     auth: httpx.BasicAuth,
@@ -556,9 +551,7 @@ async def test_map_function(
     app: FastAPI,
     with_api_server_celery_worker: TestWorkController,
     client: AsyncClient,
-    mock_handler_in_functions_rpc_interface: Callable[
-        [str, Any, Exception | None, Callable | None], MockType
-    ],
+    mock_handler_in_functions_rpc_interface: HandlerMockFactory,
     fake_registered_project_function: RegisteredProjectFunction,
     fake_registered_project_function_job: RegisteredFunctionJob,
     auth: httpx.BasicAuth,

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

@@ -127,7 +127,7 @@ async def test_list_all_solvers_jobs(
     assert mocked_backend.webserver_rpc[
         "mocked_rabbit_rpc_client"
     ].request.call_args.args == (
-        "webserver",
+        "wb-api-server",
         "list_projects_marked_as_jobs",
     )
 
@@ -173,7 +173,7 @@ async def test_list_all_solvers_jobs_with_metadata_filter(
         "mocked_rabbit_rpc_client"
     ].request.call_args
     assert call_args.args == (
-        "webserver",
+        "wb-api-server",
         "list_projects_marked_as_jobs",
     )
 

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

@@ -121,12 +121,17 @@ async def test_job_service_get_job_exceptions(
     job_service: JobService,
     client_exception_type: type[Exception],
     api_exception_type: type[Exception],
+    mocked_rabbit_rpc_client: MockType,
 ):
     job_parent_resource_name = "solver-resource"
     job_id = ProjectID("123e4567-e89b-12d3-a456-426614174000")
+
     # Patch the actual RPC interface method
-    patch_path = "servicelib.rabbitmq.rpc_interfaces.webserver.projects.get_project_marked_as_job"
-    mocker.patch(patch_path, side_effect=client_exception_type())
+    async def _request_side_effect(namespace, method_name, **kwargs):
+        if namespace == "webserver" and method_name == "get_project_marked_as_job":
+            raise client_exception_type()
+
+    mocked_rabbit_rpc_client.request.side_effect = _request_side_effect
 
     with pytest.raises(api_exception_type):
         await job_service.get_job(job_parent_resource_name, job_id)