fixes issues with fixture

Author: pcrespov

packages/models-library/src/models_library/rpc/webserver/__init__.py

@@ -0,0 +1,4 @@
+from ...api_schemas_webserver import DEFAULT_WEBSERVER_RPC_NAMESPACE
+
+__all__: tuple[str, ...] = ("DEFAULT_WEBSERVER_RPC_NAMESPACE",)
+# nopycln" file

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

@@ -26,13 +26,8 @@
 class WebserverRpcSideEffects:
     # pylint: disable=no-self-use
 
-    def __init__(self, project_job_rpc_get: ProjectJobRpcGet | None = None):
-        self.project_job_rpc_get = (
-            project_job_rpc_get
-            or ProjectJobRpcGet.model_validate(
-                ProjectJobRpcGet.model_json_schema()["examples"][0]
-            )
-        )
+    def __init__(self, fake_project_job_rpc_get: ProjectJobRpcGet):
+        self.fake_project_job_rpc_get = fake_project_job_rpc_get
 
     @validate_call(config={"arbitrary_types_allowed": True})
     async def mark_project_as_job(
@@ -112,7 +107,7 @@ async def get_project_marked_as_job(
         assert job_parent_resource_name
 
         # Return a valid example from the schema
-        _data = self.project_job_rpc_get.model_dump()
+        _data = self.fake_project_job_rpc_get.model_dump()
         _data["uuid"] = str(project_uuid)
         _data["job_parent_resource_name"] = job_parent_resource_name
         return ProjectJobRpcGet.model_validate(_data)

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

@@ -37,6 +37,7 @@
     FileUploadSchema,
     HealthCheck,
 )
+from models_library.api_schemas_webserver import DEFAULT_WEBSERVER_RPC_NAMESPACE
 from models_library.api_schemas_webserver.projects import ProjectGet
 from models_library.app_diagnostics import AppStatusCheck
 from models_library.generics import Envelope
@@ -257,10 +258,17 @@ def mocked_s3_server_url() -> Iterator[HttpUrl]:
 
 
 @pytest.fixture
-def mocked_rabbit_rpc_client(mocker: MockerFixture) -> MockType:
+def mocked_rabbit_rpc_client(
+    mocker: MockerFixture, fake_project_job_rpc_get: ProjectJobRpcGet
+) -> MockType:
     """This fixture mocks the RabbitMQRPCClient.request method which is used
     in all RPC clients in the api-server, regardeless of the namespace.
     """
+    _catalog_rpc_side_effects = CatalogRpcSideEffects()
+
+    _webserver_rpc_side_effects = WebserverRpcSideEffects(
+        fake_project_job_rpc_get=fake_project_job_rpc_get
+    )
 
     async def _request(
         namespace: RPCNamespace,
@@ -272,19 +280,18 @@ async def _request(
 
         # NOTE: we could switch to different namespaces
         if namespace == CATALOG_RPC_NAMESPACE:
-            catalog_side_effect = CatalogRpcSideEffects()
-            return await getattr(catalog_side_effect, method_name)(
+            return await getattr(_catalog_rpc_side_effects, method_name)(
                 mocker.MagicMock(), **kwargs
             )
 
-        # if not namespace == WEBSERVER_RPC_NAMESPACE
-        webserver_side_effect = WebserverRpcSideEffects()
-        return await getattr(webserver_side_effect, method_name)(
+        assert namespace == DEFAULT_WEBSERVER_RPC_NAMESPACE or namespace.startswith(
+            "wb"
+        ), "expected a webserver namespace!"
+
+        return await getattr(_webserver_rpc_side_effects, method_name)(
             mocker.MagicMock(), **kwargs
         )
 
-        pytest.fail(f"Unexpected namespace {namespace} and method {method_name}")
-
     # NOTE: mocks RabbitMQRPCClient.request(...)
     mock = mocker.MagicMock(spec=RabbitMQRPCClient)
     mock.request.side_effect = _request

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

@@ -7,7 +7,7 @@
 import pytest
 from models_library.api_schemas_webserver.projects import ProjectCreateNew, ProjectGet
 from models_library.products import ProductName
-from models_library.rpc.webserver import WEBSERVER_RPC_NAMESPACE
+from models_library.rpc.webserver import DEFAULT_WEBSERVER_RPC_NAMESPACE
 from models_library.users import UserID
 from pytest_mock import MockerFixture, MockType
 from pytest_simcore.helpers.catalog_rpc_server import CatalogRpcSideEffects
@@ -36,7 +36,7 @@ def wb_api_rpc_client(
 
     return WbApiRpcClient(
         _rpc_client=WebServerRpcClient(
-            mocked_rabbit_rpc_client, WEBSERVER_RPC_NAMESPACE
+            mocked_rabbit_rpc_client, DEFAULT_WEBSERVER_RPC_NAMESPACE
         ),
     )
 

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

@@ -354,7 +354,7 @@ async def test_start_solver_job_conflict(
 
 
 @pytest.mark.parametrize(
-    "project_job_rpc_get",
+    "fake_project_job_rpc_get",
     [
         pytest.param(
             ProjectJobRpcGet(
@@ -507,7 +507,7 @@ def _wallet_side_effect(
 
 
 @pytest.mark.parametrize(
-    "project_job_rpc_get",
+    "fake_project_job_rpc_get",
     [
         ProjectJobRpcGet(
             uuid=UUID("12345678-1234-5678-1234-123456789012"),