cleanup fixtures

Author: pcrespov

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

@@ -94,9 +94,11 @@ def _(app: FastAPI):
 
 @pytest.fixture
 async def mock_wb_api_server_rpc(app: FastAPI, mocker: MockerFixture) -> MockerFixture:
+    from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
 
     app.dependency_overrides[get_wb_api_rpc_client] = lambda: WbApiRpcClient(
-        _client=DummyRpcClient()
+        _client=DummyRpcClient(),
+        _rpc_client=mocker.MagicMock(spec=WebServerRpcClient),
     )
     return mocker
 

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

@@ -434,7 +434,13 @@ def _get_rabbitmq_rpc_client(app: FastAPI) -> RabbitMQRPCClient:
     )
 
     async def _get_wb_api_rpc_client(app: FastAPI) -> WbApiRpcClient:
-        return WbApiRpcClient(_client=mocker.MagicMock(spec=RabbitMQRPCClient))
+        from servicelib.rabbitmq import RabbitMQRPCClient
+        from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
+
+        return WbApiRpcClient(
+            _client=mocker.MagicMock(spec=RabbitMQRPCClient),
+            _rpc_client=mocker.MagicMock(spec=WebServerRpcClient),
+        )
 
     mocker.patch.object(
         functions_tasks, "get_wb_api_rpc_client", _get_wb_api_rpc_client

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

@@ -259,19 +259,30 @@ def mocked_app_dependencies(app: FastAPI, mocker: MockerFixture) -> Iterator[Non
     Mocks some dependency overrides for the FastAPI app.
     """
     assert app.state.settings.API_SERVER_RABBITMQ is None
-
+    from servicelib.rabbitmq import RabbitMQRPCClient
+    from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
     from simcore_service_api_server.api.dependencies.rabbitmq import (
         get_rabbitmq_rpc_client,
     )
     from simcore_service_api_server.api.dependencies.webserver_rpc import (
         get_wb_api_rpc_client,
     )
+    from simcore_service_api_server.core.settings import WebServerSettings
 
     def _get_rabbitmq_rpc_client_override():
         return mocker.MagicMock()
 
     async def _get_wb_api_rpc_client_override():
-        return WbApiRpcClient(_client=mocker.MagicMock())
+        webserver_settings: WebServerSettings = app.state.settings.API_SERVER_WEBSERVER
+        assert webserver_settings.WEBSERVER_RPC_NAMESPACE
+
+        rabbitmq_rpc_client = mocker.MagicMock(spec=RabbitMQRPCClient)
+        return WbApiRpcClient(
+            _client=rabbitmq_rpc_client,
+            _rpc_client=WebServerRpcClient(
+                rabbitmq_rpc_client, webserver_settings.WEBSERVER_RPC_NAMESPACE
+            ),
+        )
 
     app.dependency_overrides[get_rabbitmq_rpc_client] = (
         _get_rabbitmq_rpc_client_override

services/api-server/tests/unit/pact_broker/test_pact_checkout_release.py

@@ -60,15 +60,14 @@
 assert EXPECTED_RELEASE.stopped_at is not None
 
 
-class DummyRpcClient:
-    pass
-
-
 @pytest.fixture
 async def mock_wb_api_server_rpc(app: FastAPI, mocker: MockerFixture) -> None:
+    from servicelib.rabbitmq import RabbitMQRPCClient
+    from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
 
     app.dependency_overrides[get_wb_api_rpc_client] = lambda: WbApiRpcClient(
-        _client=DummyRpcClient()
+        _client=mocker.MagicMock(spec=RabbitMQRPCClient),
+        _rpc_client=mocker.MagicMock(spec=WebServerRpcClient),
     )
 
     mocker.patch(
@@ -84,9 +83,12 @@ async def mock_wb_api_server_rpc(app: FastAPI, mocker: MockerFixture) -> None:
 
 @pytest.fixture
 async def mock_rut_server_rpc(app: FastAPI, mocker: MockerFixture) -> None:
+    from servicelib.rabbitmq import RabbitMQRPCClient
 
     app.dependency_overrides[get_resource_usage_tracker_client] = (
-        lambda: ResourceUsageTrackerClient(_client=DummyRpcClient())
+        lambda: ResourceUsageTrackerClient(
+            _client=mocker.MagicMock(spec=RabbitMQRPCClient)
+        )
     )
 
     mocker.patch(

services/api-server/tests/unit/pact_broker/test_pact_licensed_items.py

@@ -138,9 +138,12 @@ class DummyRpcClient:
 
 @pytest.fixture
 async def mock_wb_api_server_rpc(app: FastAPI, mocker: MockerFixture) -> None:
+    from servicelib.rabbitmq import RabbitMQRPCClient
+    from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
 
     app.dependency_overrides[get_wb_api_rpc_client] = lambda: WbApiRpcClient(
-        _client=DummyRpcClient()
+        _client=mocker.MagicMock(spec=RabbitMQRPCClient),
+        _rpc_client=mocker.MagicMock(spec=WebServerRpcClient),
     )
 
     mocker.patch(

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

@@ -71,8 +71,13 @@ async def _request(
 @pytest.fixture
 def wb_api_rpc_client(
     mocked_rpc_client: MockType,
+    mocker: MockerFixture,
 ) -> WbApiRpcClient:
-    return WbApiRpcClient(_client=mocked_rpc_client)
+    from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
+
+    return WbApiRpcClient(
+        _client=mocked_rpc_client, _rpc_client=mocker.MagicMock(spec=WebServerRpcClient)
+    )
 
 
 @pytest.fixture

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

@@ -75,24 +75,24 @@ async def _get_backend_licensed_items(
     )
 
 
-class DummyRpcClient:
-    pass
-
-
 @pytest.fixture
 async def mock_wb_api_server_rcp(app: FastAPI, mocker: MockerFixture) -> MockerFixture:
+    from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
 
     app.dependency_overrides[get_wb_api_rpc_client] = lambda: WbApiRpcClient(
-        _client=DummyRpcClient()
+        _client=mocker.MagicMock(spec=RabbitMQRPCClient),
+        _rpc_client=mocker.MagicMock(spec=WebServerRpcClient),
     )
     return mocker
 
 
 @pytest.fixture
 async def mock_rut_rpc(app: FastAPI, mocker: MockerFixture) -> MockerFixture:
-    app.dependency_overrides[
-        get_resource_usage_tracker_client
-    ] = lambda: ResourceUsageTrackerClient(_client=DummyRpcClient())
+    app.dependency_overrides[get_resource_usage_tracker_client] = (
+        lambda: ResourceUsageTrackerClient(
+            _client=mocker.MagicMock(spec=RabbitMQRPCClient)
+        )
+    )
     return mocker