refactored tests

Author: Andrei Neagu

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

@@ -0,0 +1,33 @@
+import pytest
+from celery import Celery, Task
+from fastapi import FastAPI
+from models_library.progress_bar import ProgressReport
+from pytest_mock import MockerFixture
+from simcore_service_storage.modules.celery.utils import (
+    set_celery_worker_client,
+    set_fastapi_app,
+)
+from simcore_service_storage.modules.celery.worker import CeleryWorkerClient
+
+
+@pytest.fixture
+def fake_celery_task(celery_app: Celery, initialized_app: FastAPI) -> Task:
+    celery_task = Task()
+    celery_task.app = celery_app
+    set_fastapi_app(celery_app, initialized_app)
+    set_celery_worker_client(celery_app, CeleryWorkerClient(celery_app))
+    return celery_task
+
+
+@pytest.fixture
+def mock_task_progress(mocker: MockerFixture) -> list[ProgressReport]:
+    progress_updates = []
+
+    async def _progress(*args, **_) -> None:
+        progress_updates.append(args[1])
+
+    mocker.patch(
+        "simcore_service_storage.modules.celery.worker.CeleryWorkerClient.set_task_progress",
+        side_effect=_progress,
+    )
+    return progress_updates

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

@@ -1,58 +1,52 @@
 import re
-from collections.abc import Callable
 
 import pytest
-from celery import Celery
+from celery import Task
+from models_library.progress_bar import ProgressReport, ProgressStructuredMessage
 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)
+async def test_data_export(
+    mock_task_progress: list[ProgressReport], fake_celery_task: Task, user_id: UserID
+):
+    result = 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$",
         result,
     )
+
+    assert mock_task_progress == [
+        ProgressReport(
+            actual_value=0.0,
+            total=1.0,
+            attempt=0,
+            unit=None,
+            message=ProgressStructuredMessage(
+                description="create and upload export",
+                current=0.0,
+                total=1,
+                unit=None,
+                sub=None,
+            ),
+        ),
+        ProgressReport(
+            actual_value=1.0,
+            total=1.0,
+            attempt=0,
+            unit=None,
+            message=ProgressStructuredMessage(
+                description="create and upload export",
+                current=1.0,
+                total=1,
+                unit=None,
+                sub=None,
+            ),
+        ),
+    ]

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

@@ -12,19 +12,14 @@
 
 import httpx
 import pytest
-from celery import Celery, Task
+from celery import Task
 from faker import Faker
 from fastapi import FastAPI
 from models_library.projects_nodes_io import LocationID, NodeID, SimcoreS3FileID
 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._paths import compute_path_size
-from simcore_service_storage.modules.celery.utils import (
-    set_celery_worker_client,
-    set_fastapi_app,
-)
-from simcore_service_storage.modules.celery.worker import CeleryWorkerClient
 from simcore_service_storage.simcore_s3_dsm import SimcoreS3DataManager
 
 pytest_simcore_core_services_selection = [
@@ -69,16 +64,6 @@ async def _assert_compute_path_size(
     return response
 
 
-@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))
-    return celery_task
-
-
 @pytest.mark.parametrize(
     "location_id",
     [SimcoreS3DataManager.get_location_id()],