refactor

Author: sanderegg

services/storage/tests/unit/test_handlers_datasets.py

@@ -4,7 +4,6 @@
 # pylint:disable=too-many-arguments
 # pylint:disable=no-name-in-module
 
-
 from collections.abc import Awaitable, Callable
 from pathlib import Path
 
@@ -17,7 +16,7 @@
     FileMetaDataGet,
 )
 from models_library.projects import ProjectID
-from models_library.projects_nodes_io import SimcoreS3FileID
+from models_library.projects_nodes_io import LocationID, SimcoreS3FileID
 from models_library.users import UserID
 from pydantic import ByteSize
 from pytest_mock import MockerFixture
@@ -39,7 +38,7 @@ async def test_list_dataset_files_metadata_with_no_files_returns_empty_array(
     client: AsyncClient,
     user_id: UserID,
     project_id: ProjectID,
-    location_id: int,
+    location_id: LocationID,
 ):
     url = url_from_operation_id(
         client,
@@ -72,7 +71,7 @@ async def test_list_dataset_files_metadata(
     client: AsyncClient,
     user_id: UserID,
     project_id: ProjectID,
-    location_id: int,
+    location_id: LocationID,
     file_size: ByteSize,
     faker: Faker,
 ):
@@ -111,7 +110,7 @@ async def test_list_datasets_metadata(
     initialized_app: FastAPI,
     client: AsyncClient,
     user_id: UserID,
-    location_id: int,
+    location_id: LocationID,
     project_id: ProjectID,
 ):
     url = url_from_operation_id(
@@ -144,7 +143,7 @@ async def test_ensure_expand_dirs_defaults_true(
     client: AsyncClient,
     user_id: UserID,
     project_id: ProjectID,
-    location_id: int,
+    location_id: LocationID,
 ):
     mocked_object = mocker.patch(
         "simcore_service_storage.simcore_s3_dsm.SimcoreS3DataManager.list_files_in_dataset",

services/storage/tests/unit/test_handlers_files.py

@@ -974,6 +974,12 @@ async def test_download_file_no_file_was_uploaded(
     assert missing_file in error["errors"][0]
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 async def test_download_file_1_to_1_with_file_meta_data(
     initialized_app: FastAPI,
     client: httpx.AsyncClient,
@@ -1014,6 +1020,12 @@ async def test_download_file_1_to_1_with_file_meta_data(
     )
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 async def test_download_file_from_inside_a_directory(
     initialized_app: FastAPI,
     client: httpx.AsyncClient,
@@ -1076,6 +1088,12 @@ async def test_download_file_from_inside_a_directory(
     )
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 async def test_download_file_the_file_is_missing_from_the_directory(
     initialized_app: FastAPI,
     client: httpx.AsyncClient,
@@ -1288,6 +1306,12 @@ async def _list_files_and_directories(
     )
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 @pytest.mark.parametrize("link_type", LinkType)
 @pytest.mark.parametrize(
     "file_size",
@@ -1329,6 +1353,12 @@ async def test_is_directory_link_forces_link_type_and_size(
     assert files_and_directories[0].file_size == 0
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 async def test_ensure_expand_dirs_defaults_true(
     initialized_app: FastAPI,
     mocker: MockerFixture,
@@ -1355,6 +1385,12 @@ async def test_ensure_expand_dirs_defaults_true(
     assert call_args_list.kwargs["expand_dirs"] is True
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 async def test_upload_file_is_directory_and_remove_content(
     initialized_app: FastAPI,
     create_empty_directory: Callable[
@@ -1496,6 +1532,12 @@ async def test_listing_more_than_1000_objects_in_bucket(
     assert len(list_of_files) == 1000
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 @pytest.mark.parametrize("uuid_filter", [True, False])
 @pytest.mark.parametrize(
     "project_params",

services/storage/tests/unit/test_handlers_files_metadata.py

@@ -2,7 +2,6 @@
 # pylint: disable=redefined-outer-name
 # pylint: disable=unused-argument
 
-
 from collections.abc import Awaitable, Callable
 from copy import deepcopy
 from pathlib import Path
@@ -18,11 +17,13 @@
     SimcoreS3FileID,
 )
 from models_library.projects import ProjectID
+from models_library.projects_nodes_io import LocationID
 from models_library.users import UserID
 from pydantic import ByteSize, TypeAdapter
 from pytest_simcore.helpers.fastapi import url_from_operation_id
 from pytest_simcore.helpers.httpx_assert_checks import assert_status
 from servicelib.aiohttp import status
+from simcore_service_storage.simcore_s3_dsm import SimcoreS3DataManager
 from yarl import URL
 
 pytest_simcore_core_services_selection = ["postgres"]
@@ -37,8 +38,7 @@ async def __call__(
         read: bool,
         write: bool,
         delete: bool,
-    ) -> None:
-        ...
+    ) -> None: ...
 
 
 async def test_list_files_metadata(
@@ -48,7 +48,7 @@ async def test_list_files_metadata(
     client: httpx.AsyncClient,
     user_id: UserID,
     other_user_id: UserID,
-    location_id: int,
+    location_id: LocationID,
     project_id: ProjectID,
     faker: Faker,
 ):
@@ -142,7 +142,7 @@ async def test_get_file_metadata_is_legacy_services_compatible(
     initialized_app: FastAPI,
     client: httpx.AsyncClient,
     user_id: UserID,
-    location_id: int,
+    location_id: LocationID,
     simcore_file_id: SimcoreS3FileID,
 ):
     url = (
@@ -162,12 +162,18 @@ async def test_get_file_metadata_is_legacy_services_compatible(
     assert response.status_code == status.HTTP_404_NOT_FOUND
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 async def test_get_file_metadata(
     upload_file: Callable[[ByteSize, str], Awaitable[tuple[Path, SimcoreS3FileID]]],
     initialized_app: FastAPI,
     client: httpx.AsyncClient,
     user_id: UserID,
-    location_id: int,
+    location_id: LocationID,
     project_id: ProjectID,
     simcore_file_id: SimcoreS3FileID,
     faker: Faker,