tested webserver API

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 Iterator
+from collections.abc import Callable, Iterator
 from pathlib import Path
 from threading import Thread
-from typing import Annotated
+from typing import Annotated, Any
 
 import pytest
 import uvicorn
@@ -32,6 +32,7 @@
 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
@@ -234,8 +235,7 @@ async def complete_upload_file(
         file_id: StorageFileID,
         body: FileUploadCompletionBody,
         request: Request,
-    ):
-        ...
+    ): ...
 
     @router.post(
         "/locations/{location_id}/files/{file_id:path}:abort",
@@ -246,8 +246,7 @@ async def abort_upload_file(
         location_id: LocationID,
         file_id: StorageFileID,
         request: Request,
-    ):
-        ...
+    ): ...
 
     app.include_router(router)
 
@@ -311,3 +310,21 @@ 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

@@ -3,24 +3,30 @@
 # pylint: disable=unused-variable
 # pylint: disable=too-many-arguments
 
+from collections.abc import Callable
 from typing import Any
 from urllib.parse import quote
 
 import pytest
 from aiohttp.test_utils import TestClient
 from faker import Faker
 from fastapi_pagination.cursor import CursorPage
+from models_library.api_schemas_rpc_async_jobs.async_jobs import AsyncJobGet, AsyncJobId
 from models_library.api_schemas_storage.storage_schemas import (
     DatasetMetaDataGet,
     FileLocation,
     FileMetaDataGet,
     FileUploadSchema,
     PathMetaDataGet,
 )
+from models_library.api_schemas_webserver.storage import StorageAsyncJobGet
 from models_library.projects_nodes_io import LocationID, StorageFileID
 from pydantic import TypeAdapter
 from pytest_simcore.helpers.assert_checks import assert_status
 from servicelib.aiohttp import status
+from servicelib.rabbitmq.rpc_interfaces.async_jobs.async_jobs import (
+    submit_job,
+)
 from simcore_postgres_database.models.users import UserRole
 
 API_VERSION = "v0"
@@ -80,6 +86,51 @@ async def test_list_storage_paths(
         TypeAdapter(CursorPage[PathMetaDataGet]).validate_python(data)
 
 
+_faker = Faker()
+
+
+@pytest.mark.parametrize(
+    "user_role,expected",
+    [
+        (UserRole.ANONYMOUS, status.HTTP_401_UNAUTHORIZED),
+        (UserRole.GUEST, status.HTTP_202_ACCEPTED),
+        (UserRole.USER, status.HTTP_202_ACCEPTED),
+        (UserRole.TESTER, status.HTTP_202_ACCEPTED),
+    ],
+)
+@pytest.mark.parametrize(
+    "backend_result_or_exception",
+    [
+        AsyncJobGet(job_id=AsyncJobId(f"{_faker.uuid4()}")),
+    ],
+    ids=lambda x: type(x).__name__,
+)
+async def test_compute_path_size(
+    client: TestClient,
+    logged_user: dict[str, Any],
+    expected: int,
+    location_id: LocationID,
+    faker: Faker,
+    create_storage_rpc_client_mock: Callable[[str, Any], None],
+    backend_result_or_exception: Any,
+):
+    create_storage_rpc_client_mock(
+        submit_job.__name__,
+        backend_result_or_exception,
+    )
+
+    assert client.app
+    url = client.app.router["compute_path_size"].url_for(
+        location_id=f"{location_id}",
+        path=quote(faker.file_path(absolute=False), safe=""),
+    )
+
+    resp = await client.post(f"{url}", params={"user_id": logged_user["id"]})
+    data, error = await assert_status(resp, expected)
+    if not error:
+        TypeAdapter(StorageAsyncJobGet).validate_python(data)
+
+
 @pytest.mark.parametrize(
     "user_role,expected",
     [

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

@@ -1,8 +1,9 @@
 # pylint: disable=redefined-outer-name
 # pylint: disable=unused-argument
+from collections.abc import Callable
 from datetime import datetime
 from pathlib import Path
-from typing import Any, Callable
+from typing import Any
 
 import pytest
 from aiohttp.test_utils import TestClient
@@ -29,7 +30,6 @@
 )
 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,23 +44,6 @@
 _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
-
-        mocker.patch(
-            f"simcore_service_webserver.storage._rest.{method}",
-            side_effect=side_effect,
-        )
-
-    return _
-
-
 @pytest.mark.parametrize("user_role", [UserRole.USER])
 @pytest.mark.parametrize(
     "backend_result_or_exception",