mocks

Author: pcrespov

services/api-server/tests/unit/_with_db/test_product.py

@@ -26,7 +26,7 @@
 
 async def test_product_webserver(
     client: httpx.AsyncClient,
-    mocked_webserver_service_api_base: respx.MockRouter,
+    mocked_webserver_rest_api_base: respx.MockRouter,
     create_fake_api_keys: Callable[[PositiveInt], AsyncGenerator[ApiKeyInDB, None]],
     faker: Faker,
 ) -> None:
@@ -64,7 +64,7 @@ def _check_key_product_compatibility(request: httpx.Request, **kwargs):
             ),
         )
 
-    wallet_get_mock = mocked_webserver_service_api_base.get(
+    wallet_get_mock = mocked_webserver_rest_api_base.get(
         path__regex=r"/wallets/(?P<wallet_id>[-+]?\d+)"
     ).mock(side_effect=_check_key_product_compatibility)
 
@@ -80,7 +80,7 @@ def _check_key_product_compatibility(request: httpx.Request, **kwargs):
 
 async def test_product_catalog(
     client: httpx.AsyncClient,
-    mocked_catalog_service_api_base: respx.MockRouter,
+    mocked_catalog_rest_api_base: respx.MockRouter,
     create_fake_api_keys: Callable[[PositiveInt], AsyncGenerator[ApiKeyInDB, None]],
 ) -> None:
     assert client
@@ -99,7 +99,7 @@ def _get_service_side_effect(request: httpx.Request, **kwargs):
         assert key.product_name == received_product
         return httpx.Response(status_code=status.HTTP_200_OK)
 
-    respx_mock = mocked_catalog_service_api_base.get(
+    respx_mock = mocked_catalog_rest_api_base.get(
         r"/v0/services/simcore%2Fservices%2Fcomp%2Fisolve/2.0.24"
     ).mock(side_effect=_get_service_side_effect)
 

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

@@ -35,15 +35,15 @@ def solver_version() -> str:
 @pytest.fixture
 def mocked_webserver_rest_api(
     app: FastAPI,
-    mocked_webserver_service_api_base: MockRouter,
+    mocked_webserver_rest_api_base: MockRouter,
     patch_webserver_long_running_project_tasks: Callable[[MockRouter], MockRouter],
 ) -> MockRouter:
     settings: ApplicationSettings = app.state.settings
     assert settings.API_SERVER_WEBSERVER
 
-    patch_webserver_long_running_project_tasks(mocked_webserver_service_api_base)
+    patch_webserver_long_running_project_tasks(mocked_webserver_rest_api_base)
 
-    return mocked_webserver_service_api_base
+    return mocked_webserver_rest_api_base
 
 
 @pytest.fixture
@@ -78,10 +78,10 @@ def mocked_webserver_rpc_api(
 @pytest.fixture
 def mocked_catalog_rest_api(
     app: FastAPI,
-    mocked_catalog_service_api_base: MockRouter,
+    mocked_catalog_rest_api_base: MockRouter,
     catalog_service_openapi_specs: dict[str, Any],
 ) -> MockRouter:
-    respx_mock = mocked_catalog_service_api_base
+    respx_mock = mocked_catalog_rest_api_base
     openapi = deepcopy(catalog_service_openapi_specs)
     schemas = openapi["components"]["schemas"]
 
@@ -123,7 +123,7 @@ def mocked_catalog_rest_api(
 
 @pytest.fixture
 async def mocked_directorv2_rest_api(
-    mocked_directorv2_service_api_base,
+    mocked_directorv2_rest_api_base,
 ) -> AsyncIterable[MockRouter]:
     stop_time: Final[datetime] = datetime.now() + timedelta(seconds=5)
 
@@ -138,7 +138,7 @@ def _get_computation(request: httpx.Request, **kwargs) -> httpx.Response:
             status_code=status.HTTP_200_OK, json=jsonable_encoder(task)
         )
 
-    mocked_directorv2_service_api_base.get(
+    mocked_directorv2_rest_api_base.get(
         path__regex=r"/v2/computations/(?P<project_id>[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})"
     ).mock(side_effect=_get_computation)
-    return mocked_directorv2_service_api_base
+    return mocked_directorv2_rest_api_base

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

@@ -86,15 +86,15 @@ def presigned_download_link(
 def mocked_directorv2_service_api(
     app: FastAPI,
     presigned_download_link: AnyUrl,
-    mocked_directorv2_service_api_base: MockRouter,
+    mocked_directorv2_rest_api_base: MockRouter,
     directorv2_service_openapi_specs: dict[str, Any],
 ):
     settings: ApplicationSettings = app.state.settings
     assert settings.API_SERVER_DIRECTOR_V2
     oas = directorv2_service_openapi_specs
 
     # pylint: disable=not-context-manager
-    respx_mock = mocked_directorv2_service_api_base
+    respx_mock = mocked_directorv2_rest_api_base
     # check that what we emulate, actually still exists
     path = "/v2/computations/{project_id}/tasks/-/logfile"
     assert path in oas["paths"]

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

@@ -127,15 +127,15 @@ async def test_log_streaming(
 
 @pytest.fixture
 async def mock_job_not_found(
-    mocked_directorv2_service_api_base: MockRouter,
+    mocked_directorv2_rest_api_base: MockRouter,
 ) -> MockRouter:
     def _get_computation(request: httpx.Request, **kwargs) -> httpx.Response:
         return httpx.Response(status_code=status.HTTP_404_NOT_FOUND)
 
-    mocked_directorv2_service_api_base.get(
+    mocked_directorv2_rest_api_base.get(
         path__regex=r"/v2/computations/(?P<project_id>[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})"
     ).mock(side_effect=_get_computation)
-    return mocked_directorv2_service_api_base
+    return mocked_directorv2_rest_api_base
 
 
 async def test_logstreaming_job_not_found_exception(

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

@@ -23,8 +23,8 @@ class MockBackendRouters(NamedTuple):
 
 @pytest.fixture
 def mocked_backend(
-    mocked_webserver_service_api_base: MockRouter,
-    mocked_catalog_service_api_base: MockRouter,
+    mocked_webserver_rest_api_base: MockRouter,
+    mocked_catalog_rest_api_base: MockRouter,
     project_tests_dir: Path,
 ) -> MockBackendRouters:
     mock_name = "on_list_jobs.json"
@@ -35,7 +35,7 @@ def mocked_backend(
     capture = captures[0]
     assert capture.host == "catalog"
     assert capture.name == "get_service"
-    mocked_catalog_service_api_base.request(
+    mocked_catalog_rest_api_base.request(
         method=capture.method,
         path=capture.path,
         name=capture.name,
@@ -47,7 +47,7 @@ def mocked_backend(
     capture = captures[1]
     assert capture.host == "webserver"
     assert capture.name == "list_projects"
-    mocked_webserver_service_api_base.request(
+    mocked_webserver_rest_api_base.request(
         method=capture.method,
         name=capture.name,
         path=capture.path,
@@ -57,8 +57,8 @@ def mocked_backend(
     )
 
     return MockBackendRouters(
-        catalog=mocked_catalog_service_api_base,
-        webserver=mocked_webserver_service_api_base,
+        catalog=mocked_catalog_rest_api_base,
+        webserver=mocked_webserver_rest_api_base,
     )
 
 

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

@@ -13,6 +13,7 @@
 import pytest
 from fastapi.encoders import jsonable_encoder
 from pydantic import TypeAdapter
+from pytest_mock import MockType
 from pytest_simcore.helpers.httpx_calls_capture_models import HttpApiCallCaptureModel
 from pytest_simcore.helpers.httpx_calls_capture_parameters import PathDescription
 from respx import MockRouter
@@ -33,7 +34,8 @@ class MockedBackendApiDict(TypedDict):
 @pytest.fixture
 def mocked_backend(
     project_tests_dir: Path,
-    mocked_webserver_service_api_base: MockRouter,
+    mocked_webserver_rest_api_base: MockRouter,
+    mocked_webserver_rpc_api: dict[str, MockType],
 ) -> MockedBackendApiDict | None:
     # load
     captures = {
@@ -85,7 +87,7 @@ def mocked_backend(
         if group:
             # mock this entrypoint using https://lundberg.github.io/respx/guide/#iterable
             cc = [c] + [captures[_] for _ in group]
-            mocked_webserver_service_api_base.request(
+            mocked_webserver_rest_api_base.request(
                 method=c.method.upper(),
                 url=None,
                 path__regex=f"^{c.path.to_path_regex()}$",
@@ -94,15 +96,15 @@ def mocked_backend(
                 side_effect=[_.as_response() for _ in cc],
             )
         else:
-            mocked_webserver_service_api_base.request(
+            mocked_webserver_rest_api_base.request(
                 method=c.method.upper(),
                 url=None,
                 path__regex=f"^{c.path.to_path_regex()}$",
                 name=name,
             ).mock(return_value=c.as_response())
 
     return MockedBackendApiDict(
-        webserver=mocked_webserver_service_api_base,
+        webserver=mocked_webserver_rest_api_base,
     )
 
 

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

@@ -13,6 +13,7 @@
 from faker import Faker
 from fastapi import status
 from pydantic import TypeAdapter
+from pytest_mock import MockType
 from pytest_simcore.helpers.httpx_calls_capture_models import HttpApiCallCaptureModel
 from respx import MockRouter
 from servicelib.common_headers import (
@@ -33,7 +34,8 @@ class MockedBackendApiDict(TypedDict):
 
 @pytest.fixture
 def mocked_backend(
-    mocked_webserver_service_api_base: MockRouter,
+    mocked_webserver_rest_api_base: MockRouter,
+    mocked_webserver_rpc_api: dict[str, MockType],
     project_tests_dir: Path,
 ) -> MockedBackendApiDict:
     mock_name = "for_test_api_routes_studies.json"
@@ -56,7 +58,7 @@ def mocked_backend(
         capture = captures[name]
         assert capture.host == "webserver"
 
-        route = mocked_webserver_service_api_base.request(
+        route = mocked_webserver_rest_api_base.request(
             method=capture.method,
             path__regex=capture.path.removeprefix("/v0") + "$",
             name=capture.name,
@@ -65,9 +67,7 @@ def mocked_backend(
             json=capture.response_body,
         )
         print(route)
-    return MockedBackendApiDict(
-        webserver=mocked_webserver_service_api_base, catalog=None
-    )
+    return MockedBackendApiDict(webserver=mocked_webserver_rest_api_base, catalog=None)
 
 
 @pytest.mark.acceptance_test(
@@ -124,13 +124,13 @@ async def test_studies_read_workflow(
 async def test_list_study_ports(
     client: httpx.AsyncClient,
     auth: httpx.BasicAuth,
-    mocked_webserver_service_api_base: MockRouter,
+    mocked_webserver_rest_api_base: MockRouter,
     fake_study_ports: list[dict[str, Any]],
     study_id: StudyID,
 ):
     # Mocks /projects/{*}/metadata/ports
 
-    mocked_webserver_service_api_base.get(
+    mocked_webserver_rest_api_base.get(
         path__regex=r"/projects/(?P<project_id>[\w-]+)/metadata/ports$",
         name="list_project_metadata_ports",
     ).respond(
@@ -155,15 +155,15 @@ async def test_clone_study(
     client: httpx.AsyncClient,
     auth: httpx.BasicAuth,
     study_id: StudyID,
-    mocked_webserver_service_api_base: MockRouter,
+    mocked_webserver_rest_api_base: MockRouter,
     patch_webserver_long_running_project_tasks: Callable[[MockRouter], MockRouter],
     parent_project_id: UUID | None,
     parent_node_id: UUID | None,
 ):
     # Mocks /projects
-    patch_webserver_long_running_project_tasks(mocked_webserver_service_api_base)
+    patch_webserver_long_running_project_tasks(mocked_webserver_rest_api_base)
 
-    callback = mocked_webserver_service_api_base["create_projects"].side_effect
+    callback = mocked_webserver_rest_api_base["create_projects"].side_effect
     assert callback is not None
 
     def clone_project_side_effect(request: httpx.Request):
@@ -179,9 +179,9 @@ def clone_project_side_effect(request: httpx.Request):
             assert _parent_node_id == f"{parent_node_id}"
         return callback(request)
 
-    mocked_webserver_service_api_base[
-        "create_projects"
-    ].side_effect = clone_project_side_effect
+    mocked_webserver_rest_api_base["create_projects"].side_effect = (
+        clone_project_side_effect
+    )
 
     _headers = {}
     if parent_project_id is not None:
@@ -192,7 +192,7 @@ def clone_project_side_effect(request: httpx.Request):
         f"/{API_VTAG}/studies/{study_id}:clone", headers=_headers, auth=auth
     )
 
-    assert mocked_webserver_service_api_base["create_projects"].called
+    assert mocked_webserver_rest_api_base["create_projects"].called
 
     assert resp.status_code == status.HTTP_201_CREATED
 
@@ -201,11 +201,11 @@ async def test_clone_study_not_found(
     client: httpx.AsyncClient,
     auth: httpx.BasicAuth,
     faker: Faker,
-    mocked_webserver_service_api_base: MockRouter,
+    mocked_webserver_rest_api_base: MockRouter,
     patch_webserver_long_running_project_tasks: Callable[[MockRouter], MockRouter],
 ):
     # Mocks /projects
-    mocked_webserver_service_api_base.post(
+    mocked_webserver_rest_api_base.post(
         path__regex=r"/projects",
         name="project_clone",
     ).respond(