moved stuff in pytest-simcore

Author: sanderegg

services/storage/tests/unit/test_handlers_files.py

@@ -50,6 +50,10 @@
 from pytest_simcore.helpers.logging_tools import log_context
 from pytest_simcore.helpers.parametrizations import byte_size_ids
 from pytest_simcore.helpers.s3 import upload_file_part, upload_file_to_presigned_link
+from pytest_simcore.helpers.storage_utils import FileIDDict
+from pytest_simcore.helpers.storage_utils_file_meta_data import (
+    assert_file_meta_data_in_db,
+)
 from servicelib.aiohttp import status
 from simcore_service_storage.constants import S3_UNDEFINED_OR_EXTERNAL_MULTIPART_ID
 from simcore_service_storage.models import FileDownloadResponse, S3BucketName, UploadID
@@ -61,8 +65,6 @@
 from tenacity.retry import retry_if_exception_type
 from tenacity.stop import stop_after_delay
 from tenacity.wait import wait_fixed
-from tests.fixtures.data_models import FileIDDict
-from tests.helpers.utils_file_meta_data import assert_file_meta_data_in_db
 from types_aiobotocore_s3 import S3Client
 from yarl import URL
 

services/storage/tests/unit/test_handlers_locations.py

@@ -9,7 +9,7 @@
 from fastapi import FastAPI, status
 from models_library.users import UserID
 from pytest_simcore.helpers.fastapi import url_from_operation_id
-from tests.helpers.utils import has_datcore_tokens
+from pytest_simcore.helpers.storage_utils import has_datcore_tokens
 
 pytest_simcore_core_services_selection = ["postgres"]
 pytest_simcore_ops_services_selection = ["adminer"]

services/storage/tests/unit/test_handlers_simcore_s3.py

@@ -29,6 +29,11 @@
 from pytest_simcore.helpers.fastapi import url_from_operation_id
 from pytest_simcore.helpers.httpx_assert_checks import assert_status
 from pytest_simcore.helpers.logging_tools import log_context
+from pytest_simcore.helpers.storage_utils import FileIDDict, get_updated_project
+from pytest_simcore.helpers.storage_utils_file_meta_data import (
+    assert_file_meta_data_in_db,
+)
+from pytest_simcore.helpers.storage_utils_project import clone_project_data
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.aiohttp import status
 from servicelib.fastapi.long_running_tasks.client import long_running_task_request
@@ -37,13 +42,8 @@
 from simcore_service_storage.models import SearchFilesQueryParams
 from simcore_service_storage.simcore_s3_dsm import SimcoreS3DataManager
 from sqlalchemy.ext.asyncio import AsyncEngine
-from tests.fixtures.data_models import FileIDDict
-from tests.helpers.utils_file_meta_data import assert_file_meta_data_in_db
-from tests.helpers.utils_project import clone_project_data
 from yarl import URL
 
-from ..helpers.utils import get_updated_project
-
 pytest_simcore_core_services_selection = ["postgres"]
 pytest_simcore_ops_services_selection = ["adminer", "minio"]