moved modules

Author: Andrei Neagu

services/storage/tests/unit/api/_worker_tasks/test__data_export.py

@@ -0,0 +1,58 @@
+import re
+from collections.abc import Callable
+
+import pytest
+from celery import Celery
+from models_library.users import UserID
+from simcore_service_storage.api._worker_tasks._data_export import data_export
+from simcore_service_storage.modules.celery._task import define_task
+from simcore_service_storage.modules.celery.client import CeleryTaskQueueClient
+from simcore_service_storage.modules.celery.models import (
+    TaskContext,
+    TaskState,
+)
+from tenacity import Retrying, retry_if_exception_type, stop_after_delay, wait_fixed
+
+pytest_simcore_core_services_selection = [
+    "postgres",
+    "rabbit",
+]
+
+
+@pytest.fixture
+def register_celery_tasks() -> Callable[[Celery], None]:
+    def _(celery_app: Celery) -> None:
+        define_task(celery_app, data_export)
+
+    return _
+
+
+@pytest.mark.usefixtures("celery_worker")
+async def test_data_export(celery_client: CeleryTaskQueueClient, user_id: UserID):
+    task_context = TaskContext()
+
+    task_uuid = await celery_client.send_task(
+        data_export.__name__,
+        task_context=task_context,
+        user_id=user_id,
+        paths_to_export=[],
+    )
+
+    for attempt in Retrying(
+        retry=retry_if_exception_type(AssertionError),
+        wait=wait_fixed(1),
+        stop=stop_after_delay(30),
+    ):
+        with attempt:
+            status = await celery_client.get_task_status(task_context, task_uuid)
+            assert status.task_state == TaskState.SUCCESS
+
+    assert (
+        await celery_client.get_task_status(task_context, task_uuid)
+    ).task_state == TaskState.SUCCESS
+
+    result = await celery_client.get_task_result(task_context, task_uuid)
+    assert re.fullmatch(
+        rf"^exports/{user_id}/[0-9a-fA-F]{{8}}-[0-9a-fA-F]{{4}}-[0-9a-fA-F]{{4}}-[0-9a-fA-F]{{4}}-[0-9a-fA-F]{{12}}\.zip$",
+        result,
+    )

services/storage/tests/unit/test_api__worker_tasks__paths.py renamed to services/storage/tests/unit/api/_worker_tasks/test__paths.py

@@ -7,7 +7,6 @@
 # pylint:disable=unused-variable
 
 import random
-import re
 from pathlib import Path
 from typing import Any, TypeAlias
 
@@ -20,7 +19,6 @@
 from models_library.users import UserID
 from pydantic import ByteSize, TypeAdapter
 from pytest_simcore.helpers.storage_utils import FileIDDict, ProjectWithFilesParams
-from simcore_service_storage.api._worker_tasks._data_export import data_export
 from simcore_service_storage.api._worker_tasks._paths import compute_path_size
 from simcore_service_storage.modules.celery.utils import (
     set_celery_worker_client,
@@ -74,6 +72,7 @@ async def _assert_compute_path_size(
 @pytest.fixture
 def fake_celery_task(celery_app: Celery, initialized_app: FastAPI) -> Task:
     celery_task = Task()
+    celery_task.name = "fake_name"
     celery_task.app = celery_app
     set_fastapi_app(celery_app, initialized_app)
     set_celery_worker_client(celery_app, CeleryWorkerClient(celery_app))
@@ -223,12 +222,3 @@ async def test_path_compute_size_inexistent_path(
         path=Path(faker.file_path(absolute=False)),
         expected_total_size=0,
     )
-
-
-# TODO: refactor and extract common parts
-async def test_data_export(fake_celery_task: Task, user_id: UserID):
-    data = await data_export(fake_celery_task, user_id=user_id, paths_to_export=[])
-    assert re.fullmatch(
-        rf"^exports/{user_id}/[0-9a-fA-F]{{8}}-[0-9a-fA-F]{{4}}-[0-9a-fA-F]{{4}}-[0-9a-fA-F]{{4}}-[0-9a-fA-F]{{12}}\.zip$",
-        data,
-    )