fixing tests by moving fixture

Author: pcrespov

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

@@ -13,11 +13,8 @@
 from fastapi import FastAPI, status
 from fastapi.encoders import jsonable_encoder
 from models_library.projects_state import RunningState
-from pytest_mock import MockerFixture, MockType
 from pytest_simcore.helpers import faker_catalog
-from pytest_simcore.helpers.webserver_rpc_server import WebserverRpcSideEffects
 from respx import MockRouter
-from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 from simcore_service_api_server.core.settings import ApplicationSettings
 from simcore_service_api_server.services_http.director_v2 import ComputationTaskGet
 
@@ -46,35 +43,6 @@ def mocked_webserver_rest_api(
     return mocked_webserver_rest_api_base
 
 
-@pytest.fixture
-def mocked_webserver_rpc_api(
-    app: FastAPI, mocker: MockerFixture
-) -> dict[str, MockType]:
-    from servicelib.rabbitmq.rpc_interfaces.webserver import projects as projects_rpc
-    from simcore_service_api_server.services_rpc import wb_api_server
-
-    # NOTE: mock_missing_plugins patches `setup_rabbitmq`
-    try:
-        wb_api_server.WbApiRpcClient.get_from_app_state(app)
-    except AttributeError:
-        wb_api_server.setup(
-            app, RabbitMQRPCClient("fake_rpc_client", settings=mocker.MagicMock())
-        )
-
-    settings: ApplicationSettings = app.state.settings
-    assert settings.API_SERVER_WEBSERVER
-
-    side_effects = WebserverRpcSideEffects()
-
-    return {
-        "mark_project_as_job": mocker.patch.object(
-            projects_rpc,
-            "mark_project_as_job",
-            side_effects.mark_project_as_job,
-        ),
-    }
-
-
 @pytest.fixture
 def mocked_catalog_rest_api(
     app: FastAPI,

services/api-server/tests/unit/api_studies/test_api_routes_studies_jobs.py

@@ -19,7 +19,6 @@
     CreateRespxMockCallback,
     HttpApiCallCaptureModel,
 )
-from respx import MockRouter
 from servicelib.common_headers import (
     X_SIMCORE_PARENT_NODE_ID,
     X_SIMCORE_PARENT_PROJECT_UUID,
@@ -123,8 +122,9 @@ async def test_studies_jobs_workflow(
 
 async def test_start_stop_delete_study_job(
     client: httpx.AsyncClient,
-    mocked_webserver_rest_api_base,
-    mocked_directorv2_rest_api_base,
+    mocked_webserver_rest_api_base: respx.MockRouter,
+    mocked_webserver_rpc_api: dict[str, MockType],
+    mocked_directorv2_rest_api_base: respx.MockRouter,
     create_respx_mock_from_capture: CreateRespxMockCallback,
     auth: httpx.BasicAuth,
     project_tests_dir: Path,
@@ -202,8 +202,9 @@ def _check_response(response: httpx.Response, status_code: int):
 @pytest.mark.parametrize("hidden", [True, False])
 async def test_create_study_job(
     client: httpx.AsyncClient,
-    mocked_webserver_rest_api_base,
-    mocked_directorv2_rest_api_base,
+    mocked_webserver_rest_api_base: respx.MockRouter,
+    mocked_webserver_rpc_api: dict[str, MockType],
+    mocked_directorv2_rest_api_base: respx.MockRouter,
     create_respx_mock_from_capture: CreateRespxMockCallback,
     auth: httpx.BasicAuth,
     project_tests_dir: Path,
@@ -281,7 +282,8 @@ async def test_get_study_job_outputs(
     client: httpx.AsyncClient,
     fake_study_id: UUID,
     auth: httpx.BasicAuth,
-    mocked_webserver_rest_api_base: MockRouter,
+    mocked_webserver_rest_api_base: respx.MockRouter,
+    mocked_webserver_rpc_api: dict[str, MockType],
 ):
     job_id = "cfe9a77a-f71e-11ee-8fca-0242ac140008"
 
@@ -338,8 +340,9 @@ async def test_get_study_job_outputs(
 
 async def test_get_job_logs(
     client: httpx.AsyncClient,
-    mocked_webserver_rest_api_base,
-    mocked_directorv2_rest_api_base,
+    mocked_webserver_rest_api_base: respx.MockRouter,
+    mocked_webserver_rpc_api: dict[str, MockType],
+    mocked_directorv2_rest_api_base: respx.MockRouter,
     create_respx_mock_from_capture: CreateRespxMockCallback,
     auth: httpx.BasicAuth,
     project_tests_dir: Path,
@@ -365,8 +368,9 @@ async def test_get_job_logs(
 async def test_get_study_outputs(
     client: httpx.AsyncClient,
     create_respx_mock_from_capture: CreateRespxMockCallback,
-    mocked_directorv2_rest_api_base,
-    mocked_webserver_rest_api_base,
+    mocked_webserver_rest_api_base: respx.MockRouter,
+    mocked_webserver_rpc_api: dict[str, MockType],
+    mocked_directorv2_rest_api_base: respx.MockRouter,
     auth: httpx.BasicAuth,
     project_tests_dir: Path,
 ):

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

@@ -37,12 +37,14 @@
 from moto.server import ThreadedMotoServer
 from packaging.version import Version
 from pydantic import EmailStr, HttpUrl, TypeAdapter
-from pytest_mock import MockerFixture
+from pytest_mock import MockerFixture, MockType
 from pytest_simcore.helpers.host import get_localhost_ip
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
+from pytest_simcore.helpers.webserver_rpc_server import WebserverRpcSideEffects
 from pytest_simcore.simcore_webserver_projects_rest_api import GET_PROJECT
 from requests.auth import HTTPBasicAuth
 from respx import MockRouter
+from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 from simcore_service_api_server.core.application import init_app
 from simcore_service_api_server.core.settings import ApplicationSettings
 from simcore_service_api_server.db.repositories.api_keys import UserAndProductTuple
@@ -332,6 +334,35 @@ def mocked_webserver_rest_api_base(
         yield respx_mock
 
 
+@pytest.fixture
+def mocked_webserver_rpc_api(
+    app: FastAPI, mocker: MockerFixture
+) -> dict[str, MockType]:
+    from servicelib.rabbitmq.rpc_interfaces.webserver import projects as projects_rpc
+    from simcore_service_api_server.services_rpc import wb_api_server
+
+    # NOTE: mock_missing_plugins patches `setup_rabbitmq`
+    try:
+        wb_api_server.WbApiRpcClient.get_from_app_state(app)
+    except AttributeError:
+        wb_api_server.setup(
+            app, RabbitMQRPCClient("fake_rpc_client", settings=mocker.MagicMock())
+        )
+
+    settings: ApplicationSettings = app.state.settings
+    assert settings.API_SERVER_WEBSERVER
+
+    side_effects = WebserverRpcSideEffects()
+
+    return {
+        "mark_project_as_job": mocker.patch.object(
+            projects_rpc,
+            "mark_project_as_job",
+            side_effects.mark_project_as_job,
+        ),
+    }
+
+
 @pytest.fixture
 def mocked_storage_rest_api_base(
     app: FastAPI,