fix unit tests

Author: sanderegg

services/web/server/tests/unit/with_dbs/01/storage/conftest.py

@@ -5,10 +5,10 @@
 
 import logging
 import random
-from collections.abc import Callable, Iterator
+from collections.abc import Iterator
 from pathlib import Path
 from threading import Thread
-from typing import Annotated, Any
+from typing import Annotated
 from urllib.parse import quote
 
 import pytest
@@ -33,7 +33,6 @@
 from models_library.projects_nodes_io import LocationID, StorageFileID
 from models_library.users import UserID
 from pydantic import AnyUrl, TypeAdapter
-from pytest_mock import MockerFixture
 from pytest_simcore.helpers.logging_tools import log_context
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from servicelib.utils import unused_port
@@ -319,21 +318,3 @@ def app_environment(
 @pytest.fixture
 def location_id(faker: Faker) -> LocationID:
     return TypeAdapter(LocationID).validate_python(faker.pyint(min_value=0))
-
-
-@pytest.fixture
-def create_storage_rpc_client_mock(mocker: MockerFixture) -> Callable[[str, Any], None]:
-    def _(method: str, result_or_exception: Any):
-        def side_effect(*args, **kwargs):
-            if isinstance(result_or_exception, Exception):
-                raise result_or_exception
-
-            return result_or_exception
-
-        for fct in (
-            f"simcore_service_webserver.storage._rest.{method}",
-            f"servicelib.rabbitmq.rpc_interfaces.storage.paths.{method}",
-        ):
-            mocker.patch(fct, side_effect=side_effect)
-
-    return _

services/web/server/tests/unit/with_dbs/01/storage/test_storage.py

@@ -22,6 +22,7 @@
 from models_library.api_schemas_webserver.storage import StorageAsyncJobGet
 from models_library.projects_nodes_io import LocationID, StorageFileID
 from pydantic import TypeAdapter
+from pytest_mock import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
 from servicelib.aiohttp import status
 from servicelib.rabbitmq.rpc_interfaces.async_jobs.async_jobs import (
@@ -89,6 +90,23 @@ async def test_list_storage_paths(
 _faker = Faker()
 
 
+@pytest.fixture
+def create_storage_paths_rpc_client_mock(
+    mocker: MockerFixture,
+) -> Callable[[str, Any], None]:
+    def _(method: str, result_or_exception: Any):
+        def side_effect(*args, **kwargs):
+            if isinstance(result_or_exception, Exception):
+                raise result_or_exception
+
+            return result_or_exception
+
+        for fct in (f"servicelib.rabbitmq.rpc_interfaces.storage.paths.{method}",):
+            mocker.patch(fct, side_effect=side_effect)
+
+    return _
+
+
 @pytest.mark.parametrize(
     "user_role,expected",
     [
@@ -111,10 +129,10 @@ async def test_compute_path_size(
     expected: int,
     location_id: LocationID,
     faker: Faker,
-    create_storage_rpc_client_mock: Callable[[str, Any], None],
+    create_storage_paths_rpc_client_mock: Callable[[str, Any], None],
     backend_result_or_exception: Any,
 ):
-    create_storage_rpc_client_mock(
+    create_storage_paths_rpc_client_mock(
         submit_job.__name__,
         backend_result_or_exception,
     )

services/web/server/tests/unit/with_dbs/01/storage/test_storage_rpc.py

@@ -30,6 +30,7 @@
 )
 from models_library.generics import Envelope
 from models_library.progress_bar import ProgressReport
+from pytest_mock import MockerFixture
 from pytest_simcore.helpers.webserver_login import UserInfoDict
 from servicelib.aiohttp import status
 from servicelib.rabbitmq.rpc_interfaces.async_jobs.async_jobs import (
@@ -44,6 +45,21 @@
 _faker = Faker()
 
 
+@pytest.fixture
+def create_storage_rpc_client_mock(mocker: MockerFixture) -> Callable[[str, Any], None]:
+    def _(method: str, result_or_exception: Any):
+        def side_effect(*args, **kwargs):
+            if isinstance(result_or_exception, Exception):
+                raise result_or_exception
+
+            return result_or_exception
+
+        for fct in (f"simcore_service_webserver.storage._rest.{method}",):
+            mocker.patch(fct, side_effect=side_effect)
+
+    return _
+
+
 @pytest.mark.parametrize("user_role", [UserRole.USER])
 @pytest.mark.parametrize(
     "backend_result_or_exception",