api-server tests fixture

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/helpers/webserver_rpc_server.py

@@ -15,7 +15,7 @@
 class WebserverRpcSideEffects:
     # pylint: disable=no-self-use
 
-    @validate_call(config=dict(arbitrary_types_allowed=True))
+    @validate_call(config={"arbitrary_types_allowed": True})
     async def mark_project_as_job(
         self,
         rpc_client: RabbitMQRPCClient,

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

@@ -32,7 +32,7 @@ def solver_version() -> str:
 
 
 @pytest.fixture
-def mocked_webserver_service_api(
+def mocked_webserver_rest_api(
     app: FastAPI,
     mocked_webserver_service_api_base: MockRouter,
     patch_webserver_long_running_project_tasks: Callable[[MockRouter], MockRouter],
@@ -46,11 +46,17 @@ def mocked_webserver_service_api(
 
 
 @pytest.fixture
-def mocked_rpc_webserver_service_api(
+def mocked_webserver_rpc_api(
     app: FastAPI, mocker: MockerFixture
 ) -> dict[str, MockType]:
-    # from simcore_service_api_server.services_rpc.wb_api_server import projects_rpc
     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, mocker.MagicMock())
 
     settings: ApplicationSettings = app.state.settings
     assert settings.API_SERVER_WEBSERVER
@@ -67,7 +73,7 @@ def mocked_rpc_webserver_service_api(
 
 
 @pytest.fixture
-def mocked_catalog_service_api(
+def mocked_catalog_rest_api(
     app: FastAPI,
     mocked_catalog_service_api_base: MockRouter,
     catalog_service_openapi_specs: dict[str, Any],
@@ -113,7 +119,7 @@ def mocked_catalog_service_api(
 
 
 @pytest.fixture
-async def mocked_directorv2_service(
+async def mocked_directorv2_rest_api(
     mocked_directorv2_service_api_base,
 ) -> AsyncIterable[MockRouter]:
     stop_time: Final[datetime] = datetime.now() + timedelta(seconds=5)

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

@@ -18,7 +18,7 @@
 @pytest.mark.skip(reason="Still under development. Currently using fake implementation")
 async def test_list_solvers(
     client: httpx.AsyncClient,
-    mocked_catalog_service_api: MockRouter,
+    mocked_catalog_rest_api: MockRouter,
     mocker: MockFixture,
 ):
     warn = mocker.patch.object(
@@ -63,7 +63,7 @@ async def test_list_solvers(
 
 
 async def test_list_solver_ports(
-    mocked_catalog_service_api: MockRouter,
+    mocked_catalog_rest_api: MockRouter,
     client: httpx.AsyncClient,
     auth: httpx.BasicAuth,
 ):

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

@@ -204,10 +204,10 @@ async def test_run_solver_job(
     client: httpx.AsyncClient,
     directorv2_service_openapi_specs: dict[str, Any],
     catalog_service_openapi_specs: dict[str, Any],
-    mocked_catalog_service_api: MockRouter,
+    mocked_catalog_rest_api: MockRouter,
     mocked_directorv2_service_api: MockRouter,
-    mocked_webserver_service_api: MockRouter,
-    mocked_rpc_webserver_service_api: dict[str, MockType],
+    mocked_webserver_rest_api: MockRouter,
+    mocked_webserver_rpc_api: dict[str, MockType],
     auth: httpx.BasicAuth,
     project_id: str,
     solver_key: str,
@@ -280,7 +280,7 @@ async def test_run_solver_job(
         ),
     )
 
-    mocked_webserver_service_api.post(
+    mocked_webserver_rest_api.post(
         path__regex=r"^/v0/computations/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-(3|4|5)[0-9a-fA-F]{3}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}:start$",
         name="webserver_start_job",
     ).respond(
@@ -319,7 +319,7 @@ async def test_run_solver_job(
         if "boot-options" in e
     )
 
-    mocked_catalog_service_api.get(
+    mocked_catalog_rest_api.get(
         # path__regex=r"/services/(?P<service_key>[\w-]+)/(?P<service_version>[0-9\.]+)",
         path=f"/v0/services/{solver_key}/{solver_version}",
         name="get_service_v0_services__service_key___service_version__get",
@@ -355,9 +355,9 @@ async def test_run_solver_job(
     )
     assert resp.status_code == status.HTTP_201_CREATED
 
-    assert mocked_webserver_service_api["create_projects"].called
-    assert mocked_webserver_service_api["get_task_status"].called
-    assert mocked_webserver_service_api["get_task_result"].called
+    assert mocked_webserver_rest_api["create_projects"].called
+    assert mocked_webserver_rest_api["get_task_status"].called
+    assert mocked_webserver_rest_api["get_task_result"].called
 
     job = Job.model_validate(resp.json())
 

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

@@ -33,8 +33,8 @@ class MockedBackendApiDict(TypedDict):
 
 @pytest.fixture
 def mocked_backend_services_apis_for_delete_non_existing_project(
-    mocked_webserver_service_api: MockRouter,
-    mocked_rpc_webserver_service_api: dict[str, MockType],
+    mocked_webserver_rest_api: MockRouter,
+    mocked_webserver_rpc_api: dict[str, MockType],
     project_tests_dir: Path,
 ) -> MockedBackendApiDict:
     mock_name = "delete_project_not_found.json"
@@ -51,12 +51,12 @@ def _response(request: httpx.Request, project_id: str):
             status_code=capture.status_code, json=capture.response_body
         )
 
-    mocked_webserver_service_api.delete(
+    mocked_webserver_rest_api.delete(
         path__regex=rf"/projects/(?P<project_id>{UUID_RE_BASE})$",
         name="delete_project",
     ).mock(side_effect=_response)
 
-    return MockedBackendApiDict(webserver=mocked_webserver_service_api, catalog=None)
+    return MockedBackendApiDict(webserver=mocked_webserver_rest_api, catalog=None)
 
 
 @pytest.mark.acceptance_test(
@@ -86,9 +86,9 @@ async def test_delete_non_existing_solver_job(
 
 @pytest.fixture
 def mocked_backend_services_apis_for_create_and_delete_solver_job(
-    mocked_webserver_service_api: MockRouter,
-    mocked_rpc_webserver_service_api: dict[str, MockType],
-    mocked_catalog_service_api: MockRouter,
+    mocked_webserver_rest_api: MockRouter,
+    mocked_webserver_rpc_api: dict[str, MockType],
+    mocked_catalog_rest_api: MockRouter,
     project_tests_dir: Path,
 ) -> MockedBackendApiDict:
     mock_name = "on_create_job.json"
@@ -101,22 +101,22 @@ def mocked_backend_services_apis_for_create_and_delete_solver_job(
     capture = captures[0]
     assert capture.host == "catalog"
     assert capture.method == "GET"
-    mocked_catalog_service_api.request(
+    mocked_catalog_rest_api.request(
         method=capture.method, path=capture.path, name="get_service"  # GET service
     ).respond(status_code=capture.status_code, json=capture.response_body)
 
     capture = captures[-1]
     assert capture.host == "webserver"
     assert capture.method == "DELETE"
 
-    mocked_webserver_service_api.delete(
+    mocked_webserver_rest_api.delete(
         path__regex=rf"/projects/(?P<project_id>{UUID_RE_BASE})$",
         name="delete_project",
     ).respond(status_code=capture.status_code, json=capture.response_body)
 
     return MockedBackendApiDict(
-        catalog=mocked_catalog_service_api,
-        webserver=mocked_webserver_service_api,
+        catalog=mocked_catalog_rest_api,
+        webserver=mocked_webserver_rest_api,
     )
 
 

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

@@ -98,7 +98,7 @@ async def test_log_streaming(
     solver_version: str,
     fake_log_distributor,
     fake_project_for_streaming: ProjectGet,
-    mocked_directorv2_service: MockRouter,
+    mocked_directorv2_rest_api: MockRouter,
     disconnect: bool,
 ):
 

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

@@ -38,9 +38,9 @@ def _as_path_regex(initial_path: str):
 
 @pytest.fixture
 def mocked_backend(
-    mocked_webserver_service_api: MockRouter,
-    mocked_rpc_webserver_service_api: dict[str, MockType],
-    mocked_catalog_service_api: MockRouter,
+    mocked_webserver_rest_api: MockRouter,
+    mocked_webserver_rpc_api: dict[str, MockType],
+    mocked_catalog_rest_api: MockRouter,
     project_tests_dir: Path,
 ) -> MockedBackendApiDict:
     mock_name = "for_test_get_and_update_job_metadata.json"
@@ -54,7 +54,7 @@ def mocked_backend(
 
     capture = captures["get_service"]
     assert capture.host == "catalog"
-    mocked_catalog_service_api.request(
+    mocked_catalog_rest_api.request(
         method=capture.method,
         path=capture.path,
         name=capture.name,
@@ -68,7 +68,7 @@ def mocked_backend(
         assert capture.host == "webserver"
         capture_path_regex = _as_path_regex(capture.path.removeprefix("/v0"))
 
-        route = mocked_webserver_service_api.request(
+        route = mocked_webserver_rest_api.request(
             method=capture.method,
             path__regex=capture_path_regex,
             name=capture.name,
@@ -88,7 +88,7 @@ def mocked_backend(
             )
 
     return MockedBackendApiDict(
-        webserver=mocked_webserver_service_api, catalog=mocked_catalog_service_api
+        webserver=mocked_webserver_rest_api, catalog=mocked_catalog_rest_api
     )