moved fixtures and helpers to pytest-simcore

Author: sanderegg

services/storage/tests/helpers/utils.py renamed to packages/pytest-simcore/src/pytest_simcore/helpers/storage_utils.py

@@ -1,7 +1,10 @@
 import logging
 import os
+from pathlib import Path
+from typing import TypedDict
 
 import sqlalchemy as sa
+from models_library.basic_types import SHA256Str
 from models_library.projects import ProjectAtDB
 from simcore_postgres_database.storage_models import projects
 from sqlalchemy.ext.asyncio import AsyncEngine
@@ -26,3 +29,8 @@ async def get_updated_project(
         )
         row = result.one()
         return ProjectAtDB.model_validate(row)
+
+
+class FileIDDict(TypedDict):
+    path: Path
+    sha256_checksum: SHA256Str

services/storage/tests/helpers/utils_file_meta_data.py renamed to packages/pytest-simcore/src/pytest_simcore/helpers/storage_utils_file_meta_data.py

@@ -7,7 +7,7 @@
 from contextlib import asynccontextmanager
 from pathlib import Path
 from random import choice, randint
-from typing import Any, TypedDict, cast
+from typing import Any, cast
 
 import pytest
 import sqlalchemy as sa
@@ -17,14 +17,14 @@
 from models_library.projects_nodes_io import NodeID, SimcoreS3FileID, StorageFileID
 from models_library.users import UserID
 from pydantic import ByteSize, TypeAdapter
-from pytest_simcore.helpers.faker_factories import random_project, random_user
 from servicelib.utils import limited_gather
 from simcore_postgres_database.models.project_to_groups import project_to_groups
 from simcore_postgres_database.storage_models import projects, users
 from sqlalchemy.dialects.postgresql import insert as pg_insert
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine
 
-from ..helpers.utils import get_updated_project
+from .helpers.faker_factories import random_project, random_user
+from .helpers.storage_utils import FileIDDict, get_updated_project
 
 
 @asynccontextmanager
@@ -259,11 +259,6 @@ async def _creator(
     return _creator
 
 
-class FileIDDict(TypedDict):
-    path: Path
-    sha256_checksum: SHA256Str
-
-
 async def _upload_file_and_update_project(
     project_id: ProjectID,
     node_id: NodeID,

services/storage/tests/helpers/utils_project.py renamed to packages/pytest-simcore/src/pytest_simcore/helpers/storage_utils_project.py

@@ -46,6 +46,10 @@
 from pytest_simcore.helpers.logging_tools import log_context
 from pytest_simcore.helpers.monkeypatch_envs import delenvs_from_dict, setenvs_from_dict
 from pytest_simcore.helpers.s3 import 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 pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.aiohttp import status
 from simcore_postgres_database.storage_models import file_meta_data, projects, users
@@ -63,8 +67,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
 
@@ -82,8 +84,8 @@
     "pytest_simcore.postgres_service",
     "pytest_simcore.pytest_global_environs",
     "pytest_simcore.repository_paths",
-    "tests.fixtures.data_models",
-    "tests.fixtures.datcore_adapter",
+    "pytest_simcore.simcore_storage_data_models",
+    "pytest_simcore.simcore_storage_datcore_adapter",
 ]
 
 CURRENT_DIR = Path(sys.argv[0] if __name__ == "__main__" else __file__).resolve().parent

services/storage/tests/fixtures/data_models.py renamed to packages/pytest-simcore/src/pytest_simcore/simcore_storage_data_models.py

@@ -18,8 +18,8 @@
 from models_library.users import UserID
 from pytest_simcore.helpers.fastapi import url_from_operation_id
 from pytest_simcore.helpers.httpx_assert_checks import assert_status
+from pytest_simcore.helpers.storage_utils import FileIDDict
 from servicelib.aiohttp import status
-from tests.fixtures.data_models import FileIDDict
 
 pytest_simcore_core_services_selection = ["postgres"]
 pytest_simcore_ops_services_selection = ["adminer"]