move tasks tests

Author: giancarloromeo

services/web/server/tests/unit/with_dbs/01/conftest.py

@@ -2,7 +2,11 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
+from collections.abc import Callable
+from typing import Any
+
 import pytest
+from pytest_mock import MockerFixture
 
 
 @pytest.fixture
@@ -12,3 +16,20 @@ def app_environment(
     # NOTE: overrides app_environment
     monkeypatch.setenv("WEBSERVER_GARBAGE_COLLECTOR", "null")
     return app_environment | {"WEBSERVER_GARBAGE_COLLECTOR": "null"}
+
+
+@pytest.fixture
+def create_backend_mock(
+    mocker: MockerFixture,
+) -> Callable[[str, str, Any], None]:
+    def _(module: str, method: str, result_or_exception: Any):
+        def side_effect(*args, **kwargs):
+            if isinstance(result_or_exception, Exception):
+                raise result_or_exception
+
+            return result_or_exception
+
+        for fct in (f"{module}.{method}",):
+            mocker.patch(fct, side_effect=side_effect)
+
+    return _

services/web/server/tests/unit/with_dbs/01/storage/test_storage.py

@@ -9,7 +9,6 @@
 from urllib.parse import quote
 
 import pytest
-import simcore_service_webserver.tasks._controller._rest
 from aiohttp.test_utils import TestClient
 from faker import Faker
 from models_library.api_schemas_long_running_tasks.tasks import (
@@ -25,10 +24,7 @@
     AsyncJobStatus,
 )
 from models_library.api_schemas_rpc_async_jobs.exceptions import (
-    JobAbortedError,
-    JobError,
     JobMissingError,
-    JobNotDoneError,
     JobSchedulerError,
 )
 from models_library.api_schemas_storage.export_data_async_jobs import (
@@ -425,23 +421,6 @@ async def test_upload_file(
         assert not data
 
 
-@pytest.fixture
-def create_backend_mock(
-    mocker: MockerFixture,
-) -> Callable[[str, str, Any], None]:
-    def _(module: str, method: str, result_or_exception: Any):
-        def side_effect(*args, **kwargs):
-            if isinstance(result_or_exception, Exception):
-                raise result_or_exception
-
-            return result_or_exception
-
-        for fct in (f"{module}.{method}",):
-            mocker.patch(fct, side_effect=side_effect)
-
-    return _
-
-
 @pytest.mark.parametrize("user_role", _user_roles)
 @pytest.mark.parametrize(
     "backend_result_or_exception, expected_status",
@@ -572,76 +551,6 @@ async def test_cancel_async_jobs(
     assert response.status == expected_status
 
 
-@pytest.mark.parametrize("user_role", _user_roles)
-@pytest.mark.parametrize(
-    "backend_result_or_exception, expected_status",
-    [
-        (JobNotDoneError(job_id=_faker.uuid4()), status.HTTP_404_NOT_FOUND),
-        (AsyncJobResult(result=None), status.HTTP_200_OK),
-        (JobError(job_id=_faker.uuid4()), status.HTTP_500_INTERNAL_SERVER_ERROR),
-        (JobAbortedError(job_id=_faker.uuid4()), status.HTTP_410_GONE),
-        (JobSchedulerError(exc=_faker.text()), status.HTTP_500_INTERNAL_SERVER_ERROR),
-        (JobMissingError(job_id=_faker.uuid4()), status.HTTP_404_NOT_FOUND),
-    ],
-    ids=lambda x: type(x).__name__,
-)
-async def test_get_async_job_result(
-    user_role: UserRole,
-    logged_user: UserInfoDict,
-    client: TestClient,
-    create_backend_mock: Callable[[str, str, Any], None],
-    faker: Faker,
-    backend_result_or_exception: Any,
-    expected_status: int,
-):
-    _job_id = AsyncJobId(faker.uuid4())
-    create_backend_mock(
-        tasks_rest.__name__,
-        f"_tasks_service.{_tasks_service.get_task_result.__name__}",
-        backend_result_or_exception,
-    )
-
-    response = await client.get(f"/{API_VERSION}/tasks/{_job_id}/result")
-    assert response.status == expected_status
-
-
-@pytest.mark.parametrize("user_role", _user_roles)
-@pytest.mark.parametrize(
-    "backend_result_or_exception, expected_status",
-    [
-        (
-            [
-                AsyncJobGet(
-                    job_id=AsyncJobId(_faker.uuid4()),
-                    job_name="task_name",
-                )
-            ],
-            status.HTTP_200_OK,
-        ),
-        (JobSchedulerError(exc=_faker.text()), status.HTTP_500_INTERNAL_SERVER_ERROR),
-    ],
-    ids=lambda x: type(x).__name__,
-)
-async def test_get_user_async_jobs(
-    user_role: UserRole,
-    logged_user: UserInfoDict,
-    client: TestClient,
-    create_backend_mock: Callable[[str, str, Any], None],
-    backend_result_or_exception: Any,
-    expected_status: int,
-):
-    create_backend_mock(
-        tasks_rest.__name__,
-        f"_tasks_service.{_tasks_service.list_tasks.__name__}",
-        backend_result_or_exception,
-    )
-
-    response = await client.get(f"/{API_VERSION}/tasks")
-    assert response.status == expected_status
-    if response.status == status.HTTP_200_OK:
-        Envelope[list[TaskGet]].model_validate(await response.json())
-
-
 @pytest.mark.parametrize("user_role", _user_roles)
 @pytest.mark.parametrize(
     "http_method, href, backend_method, backend_object, return_status, return_schema",
@@ -723,79 +632,3 @@ async def test_get_async_job_links(
     assert response.status == return_status
     if return_schema:
         Envelope[return_schema].model_validate(await response.json())
-
-
-@pytest.fixture
-def create_consume_events_mock(
-    mocker: MockerFixture,
-) -> Callable[[Any], None]:
-    def _(result_or_exception: Any):
-        async def mock_consume_events(*args, **kwargs):
-            if isinstance(result_or_exception, Exception):
-                raise result_or_exception
-            # Yield the mock events
-            for event_id, event_data in result_or_exception:
-                yield event_id, event_data
-
-        mock_task_manager = mocker.MagicMock()
-        mock_task_manager.consume_task_events = mock_consume_events
-        mocker.patch.object(
-            simcore_service_webserver.tasks._controller._rest,
-            "get_task_manager",
-            return_value=mock_task_manager,
-        )
-
-    return _
-
-
-class MockEvent:
-    def __init__(self, event_type: str, event_data: dict[str, Any]):
-        self.type = event_type
-        self.data = event_data
-
-
-@pytest.mark.parametrize("user_role", _user_roles)
-@pytest.mark.parametrize(
-    "backend_result_or_exception, expected_status",
-    [
-        (
-            [
-                ("event-1", MockEvent("status", {"status": "running"})),
-                ("event-2", MockEvent("progress", {"percent": 50})),
-                ("event-3", MockEvent("status", {"status": "completed"})),
-            ],
-            status.HTTP_200_OK,
-        ),
-        ([], status.HTTP_200_OK),  # No events
-    ],
-    ids=lambda x: (
-        "with_events" if x and isinstance(x, list) and len(x) > 0 else "no_events"
-    ),
-)
-async def test_get_async_job_stream(
-    user_role: UserRole,
-    logged_user: UserInfoDict,
-    client: TestClient,
-    create_consume_events_mock: Callable[[Any], None],
-    faker: Faker,
-    backend_result_or_exception: Any,
-    expected_status: int,
-):
-    create_consume_events_mock(backend_result_or_exception)
-
-    _task_id = AsyncJobId(faker.uuid4())
-
-    response = await client.get(
-        f"/{API_VERSION}/tasks/{_task_id}/stream",
-        headers={"Accept": "text/event-stream"},
-    )
-    assert response.status == expected_status
-
-    if response.status == status.HTTP_200_OK:
-        assert response.headers.get("Content-Type") == "text/event-stream"
-
-        content = await response.text()
-        if backend_result_or_exception:
-            assert "data:" in content or len(backend_result_or_exception) == 0
-        else:
-            assert content == ""