refactor: rename mock dependencies for clarity and consistency in tests

Author: pcrespov

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

@@ -38,10 +38,6 @@
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.helpers.typing_mock import HandlerMockFactory
-from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
-from simcore_service_api_server.api.dependencies import services
-from simcore_service_api_server.api.dependencies.services import get_rabbitmq_rpc_client
-from simcore_service_api_server.api.routes.functions_routes import get_wb_api_rpc_client
 
 
 @pytest.fixture
@@ -59,50 +55,16 @@ def app_environment(
     )
 
 
-class DummyRpcClient(RabbitMQRPCClient):
-
-    def __init__(self):
-        self.client_name = "dummy_client"
-        self.settings = {}  # type: ignore # Add a settings attribute to avoid AttributeError
-
-    async def request(self, namespace: str, method_name: str, **kwargs):
-        # Mock implementation of the request method
-        assert isinstance(namespace, str)
-        assert isinstance(method_name, str)
-        assert isinstance(kwargs, dict)
-        return {"mocked_response": True}
-
-
 @pytest.fixture
-async def mock_rabbitmq_rpc_client(
+async def mock_dependency_get_celery_task_manager(
     app: FastAPI, mocker: MockerFixture
-) -> MockerFixture:
-    def _():
-        return DummyRpcClient()
-
-    app.dependency_overrides[get_rabbitmq_rpc_client] = _
-    return mocker
-
-
-@pytest.fixture
-async def mock_celery_task_manager(app: FastAPI, mocker: MockerFixture) -> MockType:
+) -> MockType:
     def _new(app: FastAPI):
         return None
 
-    return mocker.patch.object(services, services.get_task_manager.__name__, _new)
-
+    from simcore_service_api_server.api.dependencies import services
 
-@pytest.fixture
-async def mock_get_wb_api_rpc_client(app: FastAPI, mocker: MockerFixture) -> None:
-    def _new():
-        from simcore_service_api_server.services_rpc import wb_api_server
-
-        # pylint: disable=protected-access
-        return wb_api_server._create_obj(
-            app, mocker.MagicMock(spec=RabbitMQRPCClient)
-        )  # noqa: SLF001
-
-    app.dependency_overrides[get_wb_api_rpc_client] = _new
+    return mocker.patch.object(services, services.get_task_manager.__name__, _new)
 
 
 @pytest.fixture
@@ -272,7 +234,7 @@ def fake_registered_function_job_collection(
 
 @pytest.fixture()
 def mock_handler_in_functions_rpc_interface(
-    mock_get_wb_api_rpc_client: None,
+    mocked_app_rpc_dependencies: None,
     mocker: MockerFixture,
 ) -> HandlerMockFactory:
     def _create(
@@ -299,7 +261,7 @@ def _create(
 
 @pytest.fixture()
 def mock_method_in_jobs_service(
-    mock_get_wb_api_rpc_client: None,
+    mocked_app_rpc_dependencies: None,
     mocker: MockerFixture,
 ) -> Callable[[str, Any, Exception | None], MockType]:
     def _create(

services/api-server/tests/unit/api_functions/test_api_routers_function_job_collections.py

@@ -13,7 +13,6 @@
     RegisteredProjectFunctionJob,
 )
 from models_library.rest_pagination import PageMetaInfoLimitOffset
-from pytest_mock import MockerFixture
 from servicelib.aiohttp import status
 from simcore_service_api_server._meta import API_VTAG
 
@@ -107,7 +106,7 @@ async def test_delete_function_job_collection(
 @pytest.mark.parametrize("response_type", ["page", "list"])
 async def test_get_function_job_collection_jobs(
     client: AsyncClient,
-    mock_rabbitmq_rpc_client: MockerFixture,
+    mocked_app_rpc_dependencies: None,
     mock_handler_in_functions_rpc_interface: Callable[[str, Any], None],
     fake_registered_function_job_collection: RegisteredFunctionJobCollection,
     fake_registered_project_function_job: RegisteredProjectFunctionJob,

services/api-server/tests/unit/api_functions/test_api_routers_function_jobs.py

@@ -114,8 +114,9 @@ async def test_get_function_job(
 
 async def test_list_function_jobs(
     client: AsyncClient,
-    mock_rabbitmq_rpc_client: MockerFixture,
-    mock_celery_task_manager: MockType,
+    mocked_app_rpc_dependencies: None,
+    mocked_rabbit_rpc_client: MockerFixture,
+    mock_dependency_get_celery_task_manager: MockType,
     mock_handler_in_functions_rpc_interface: Callable[[str, Any], None],
     fake_registered_project_function_job: RegisteredProjectFunctionJob,
     auth: httpx.BasicAuth,
@@ -141,8 +142,8 @@ async def test_list_function_jobs(
 @pytest.mark.parametrize("status_str", ["SUCCESS", "FAILED"])
 async def test_list_function_jobs_with_status(
     client: AsyncClient,
-    mock_rabbitmq_rpc_client: MockerFixture,
-    mock_celery_task_manager: MockType,
+    mocked_app_rpc_dependencies: None,
+    mock_dependency_get_celery_task_manager: MockType,
     mock_handler_in_functions_rpc_interface: Callable[[str, Any], None],
     fake_registered_project_function: RegisteredProjectFunction,
     fake_registered_project_function_job: RegisteredProjectFunctionJob,
@@ -196,8 +197,8 @@ async def test_list_function_jobs_with_status(
 
 async def test_list_function_jobs_with_job_id_filter(
     client: AsyncClient,
-    mock_celery_task_manager: MockType,
-    mock_rabbitmq_rpc_client: MockerFixture,
+    mock_dependency_get_celery_task_manager: MockType,
+    mocked_app_rpc_dependencies: None,
     mock_handler_in_functions_rpc_interface: Callable[[str], MockType],
     fake_registered_project_function_job: RegisteredProjectFunctionJob,
     user_id: UserID,
@@ -273,7 +274,7 @@ def mocked_list_function_jobs(offset: int, limit: int):
 )
 async def test_get_function_job_status(
     app: FastAPI,
-    mocked_app_dependencies: None,
+    mocked_app_rpc_dependencies: None,
     client: AsyncClient,
     mocker: MockerFixture,
     mock_handler_in_functions_rpc_interface: Callable[
@@ -397,8 +398,8 @@ async def _update_function_job_status_side_effect(*args, **kwargs):
 )
 async def test_get_function_job_outputs(
     client: AsyncClient,
-    mock_celery_task_manager: MockType,
-    mock_rabbitmq_rpc_client: MockerFixture,
+    mocked_app_rpc_dependencies: None,
+    mock_dependency_get_celery_task_manager: MockType,
     mock_handler_in_functions_rpc_interface: Callable[[str, Any], None],
     fake_registered_project_function_job: RegisteredProjectFunctionJob,
     fake_registered_project_function: RegisteredProjectFunction,

services/api-server/tests/unit/api_functions/test_api_routers_functions.py

@@ -289,7 +289,7 @@ async def test_get_function_output_schema(
 
 async def test_validate_function_inputs(
     client: AsyncClient,
-    mock_rabbitmq_rpc_client: MockerFixture,
+    mocked_app_rpc_dependencies: None,
     mock_handler_in_functions_rpc_interface: Callable[[str, Any], None],
     fake_registered_project_function: RegisteredProjectFunction,
     auth: httpx.BasicAuth,
@@ -332,7 +332,7 @@ async def test_delete_function(
 async def test_run_map_function_not_allowed(
     client: AsyncClient,
     mocker: MockerFixture,
-    mock_celery_task_manager: MockType,
+    mock_dependency_get_celery_task_manager: MockType,
     mock_handler_in_functions_rpc_interface: Callable[[str, Any], None],
     fake_registered_project_function: RegisteredProjectFunction,
     auth: httpx.BasicAuth,

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

@@ -300,13 +300,12 @@ async def _request(
 
 
 @pytest.fixture
-def mocked_app_dependencies(
-    app: FastAPI, mocker: MockerFixture, mocked_rabbit_rpc_client: MockType
+def mocked_app_rpc_dependencies(
+    app: FastAPI, mocked_rabbit_rpc_client: MockType
 ) -> Iterator[None]:
     """
-    Mocks some dependency overrides for the FastAPI app.
+    Mocks rabbit clients overrides for the FastAPI app.
     """
-    assert app.state.settings.API_SERVER_RABBITMQ is None
     from simcore_service_api_server.api.dependencies.rabbitmq import (
         get_rabbitmq_rpc_client,
     )
@@ -315,12 +314,7 @@ def mocked_app_dependencies(
     )
 
     # Overrides Depends[get_rabbitmq_rpc_client]
-    def _get_rabbitmq_rpc_client_override():
-        return mocked_rabbit_rpc_client
-
-    app.dependency_overrides[get_rabbitmq_rpc_client] = (
-        _get_rabbitmq_rpc_client_override
-    )
+    app.dependency_overrides[get_rabbitmq_rpc_client] = lambda: mocked_rabbit_rpc_client
 
     # Overrides Depends[get_wb_api_rpc_client]
     async def _get_wb_api_rpc_client_override():
@@ -628,7 +622,7 @@ def fake_job_links() -> JobLinks:
 
 @pytest.fixture
 def mocked_webserver_rpc_api(
-    mocked_app_dependencies: None,
+    mocked_app_rpc_dependencies: None,
     mocked_rabbit_rpc_client: MockType,
 ) -> dict[str, MockType]:
     """
@@ -651,7 +645,9 @@ def catalog_rpc_side_effects(request) -> Any:
 
 @pytest.fixture
 def mocked_catalog_rpc_api(
-    mocked_app_dependencies: None, mocker: MockerFixture, catalog_rpc_side_effects: Any
+    mocked_app_rpc_dependencies: None,
+    mocker: MockerFixture,
+    catalog_rpc_side_effects: Any,
 ) -> dict[str, MockType]:
     """
     Mocks the catalog's simcore service RPC API for testing purposes.
@@ -692,7 +688,7 @@ def directorv2_rpc_side_effects(request) -> Any:
 
 @pytest.fixture
 def mocked_directorv2_rpc_api(
-    mocked_app_dependencies: None,
+    mocked_app_rpc_dependencies: None,
     mocker: MockerFixture,
     directorv2_rpc_side_effects: Any,
 ) -> dict[str, MockType]:
@@ -735,7 +731,7 @@ def storage_rpc_side_effects(request) -> Any:
 
 @pytest.fixture
 def mocked_storage_rpc_api(
-    mocked_app_dependencies: None,
+    mocked_app_rpc_dependencies: None,
     mocker: MockerFixture,
     storage_rpc_side_effects: Any,
 ) -> dict[str, MockType]:

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

@@ -206,7 +206,7 @@ def _get_pricing_unit_side_effect(
     ],
 )
 async def test_start_solver_job_pricing_unit_with_payment(
-    mocked_app_dependencies: None,
+    mocked_app_rpc_dependencies: None,
     client: AsyncClient,
     mocked_webserver_rest_api_base: MockRouter,
     mocked_directorv2_rest_api_base: MockRouter,
@@ -283,7 +283,7 @@ def _put_pricing_plan_and_unit_side_effect(
 
 
 async def test_get_solver_job_pricing_unit_no_payment(
-    mocked_app_dependencies: None,
+    mocked_app_rpc_dependencies: None,
     client: AsyncClient,
     mocked_webserver_rest_api_base: MockRouter,
     mocked_directorv2_rest_api_base: MockRouter,
@@ -318,7 +318,7 @@ async def test_get_solver_job_pricing_unit_no_payment(
 
 
 async def test_start_solver_job_conflict(
-    mocked_app_dependencies: None,
+    mocked_app_rpc_dependencies: None,
     client: AsyncClient,
     mocked_webserver_rest_api_base: MockRouter,
     mocked_directorv2_rest_api_base: MockRouter,