refactor

Author: sanderegg

services/storage/tests/unit/test__legacy_storage_sdk_compatibility.py

@@ -12,16 +12,16 @@
 """
 
 import logging
+from collections.abc import AsyncIterator
 from pathlib import Path
 from threading import Thread
-from typing import AsyncIterator
 
 import aiohttp
 import httpx
 import pytest
 import uvicorn
 from faker import Faker
-from models_library.projects_nodes_io import LocationID, SimcoreS3FileID
+from models_library.projects_nodes_io import SimcoreS3FileID
 from models_library.users import UserID
 from pytest_simcore.helpers.logging_tools import log_context
 from servicelib.utils import unused_port
@@ -112,21 +112,22 @@ def file_id(simcore_file_id: SimcoreS3FileID) -> str:
 
 
 @pytest.fixture
-def location_id() -> LocationID:
-    return SimcoreS3DataManager.get_location_id()
-
-
-@pytest.fixture
-def location_name() -> str:
+def simcore_location_name() -> str:
     return SimcoreS3DataManager.get_location_name()
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 async def test_storage_client_used_in_simcore_sdk_0_3_2(
     real_storage_server: URL,
     str_user_id: str,
     file_id: str,
     location_id: int,
-    location_name: str,
+    simcore_location_name: str,
     tmp_path: Path,
     faker: Faker,
 ):
@@ -211,7 +212,7 @@ async def test_storage_client_used_in_simcore_sdk_0_3_2(
         resp_model = await api.get_storage_locations(user_id=str_user_id)
         print(f"{resp_model=}")
         for location in resp_model.data:
-            assert location["name"] == location_name
+            assert location["name"] == simcore_location_name
             assert location["id"] == location_id
 
         # _get_download_link

services/storage/tests/unit/test_handlers_datasets.py

@@ -28,6 +28,7 @@
     parametrized_file_size,
 )
 from servicelib.aiohttp import status
+from simcore_service_storage.simcore_s3_dsm import SimcoreS3DataManager
 
 pytest_simcore_core_services_selection = ["postgres"]
 pytest_simcore_ops_services_selection = ["adminer"]
@@ -54,6 +55,12 @@ async def test_list_dataset_files_metadata_with_no_files_returns_empty_array(
     assert not error
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 @pytest.mark.parametrize(
     "file_size",
     [parametrized_file_size("100Mib")],
@@ -94,6 +101,12 @@ async def test_list_dataset_files_metadata(
         assert fmd.file_size == file.stat().st_size
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 async def test_list_datasets_metadata(
     initialized_app: FastAPI,
     client: AsyncClient,
@@ -119,6 +132,12 @@ async def test_list_datasets_metadata(
     assert dataset.dataset_id == project_id
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 async def test_ensure_expand_dirs_defaults_true(
     mocker: MockerFixture,
     initialized_app: FastAPI,

services/storage/tests/unit/test_handlers_files.py

@@ -58,6 +58,7 @@
 from simcore_service_storage.modules.long_running_tasks import (
     get_completed_upload_tasks,
 )
+from simcore_service_storage.simcore_s3_dsm import SimcoreS3DataManager
 from sqlalchemy.ext.asyncio import AsyncEngine
 from tenacity.asyncio import AsyncRetrying
 from tenacity.retry import retry_if_exception_type
@@ -87,9 +88,9 @@ async def assert_multipart_uploads_in_progress(
     expected_upload_ids: list[str] | None,
 ):
     """if None is passed, then it checks that no uploads are in progress"""
-    list_uploads: list[
-        tuple[UploadID, S3ObjectKey]
-    ] = await storage_s3_client.list_ongoing_multipart_uploads(bucket=storage_s3_bucket)
+    list_uploads: list[tuple[UploadID, S3ObjectKey]] = (
+        await storage_s3_client.list_ongoing_multipart_uploads(bucket=storage_s3_bucket)
+    )
     if expected_upload_ids is None:
         assert (
             not list_uploads
@@ -586,6 +587,12 @@ async def test_upload_real_file(
     await upload_file(file_size, complex_file_name)
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 @pytest.mark.parametrize(
     "file_size",
     [
@@ -830,6 +837,12 @@ async def test_upload_real_file_with_s3_client(
     assert s3_metadata.e_tag == completion_etag
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 @pytest.mark.parametrize(
     "file_size",
     [
@@ -930,7 +943,7 @@ async def _assert_file_downloaded(
 async def test_download_file_no_file_was_uploaded(
     initialized_app: FastAPI,
     client: httpx.AsyncClient,
-    location_id: int,
+    location_id: LocationID,
     project_id: ProjectID,
     node_id: NodeID,
     user_id: UserID,
@@ -966,7 +979,7 @@ async def test_download_file_1_to_1_with_file_meta_data(
     client: httpx.AsyncClient,
     file_size: ByteSize,
     upload_file: Callable[[ByteSize, str], Awaitable[tuple[Path, SimcoreS3FileID]]],
-    location_id: int,
+    location_id: LocationID,
     user_id: UserID,
     storage_s3_client: SimcoreS3API,
     storage_s3_bucket: S3BucketName,
@@ -1005,7 +1018,7 @@ async def test_download_file_from_inside_a_directory(
     initialized_app: FastAPI,
     client: httpx.AsyncClient,
     file_size: ByteSize,
-    location_id: int,
+    location_id: LocationID,
     user_id: UserID,
     project_id: ProjectID,
     node_id: NodeID,
@@ -1066,7 +1079,7 @@ async def test_download_file_from_inside_a_directory(
 async def test_download_file_the_file_is_missing_from_the_directory(
     initialized_app: FastAPI,
     client: httpx.AsyncClient,
-    location_id: int,
+    location_id: LocationID,
     user_id: UserID,
     project_id: ProjectID,
     node_id: NodeID,
@@ -1099,7 +1112,7 @@ async def test_download_file_the_file_is_missing_from_the_directory(
 async def test_download_file_access_rights(
     initialized_app: FastAPI,
     client: httpx.AsyncClient,
-    location_id: int,
+    location_id: LocationID,
     user_id: UserID,
     storage_s3_client: SimcoreS3API,
     storage_s3_bucket: S3BucketName,
@@ -1144,7 +1157,7 @@ async def test_delete_file(
     client: httpx.AsyncClient,
     file_size: ByteSize,
     upload_file: Callable[[ByteSize, str], Awaitable[tuple[Path, SimcoreS3FileID]]],
-    location_id: int,
+    location_id: LocationID,
     user_id: UserID,
     faker: Faker,
 ):
@@ -1321,7 +1334,7 @@ async def test_ensure_expand_dirs_defaults_true(
     mocker: MockerFixture,
     client: httpx.AsyncClient,
     user_id: UserID,
-    location_id: int,
+    location_id: LocationID,
 ):
     mocked_object = mocker.patch(
         "simcore_service_storage.simcore_s3_dsm.SimcoreS3DataManager.list_files",