Skip to content

Commit 18effae

Browse files
committed
start converting task tests
1 parent 162c8ee commit 18effae

File tree

3 files changed

+10
-15
lines changed

3 files changed

+10
-15
lines changed

services/api-server/tests/unit/celery/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def add_worker_tasks() -> bool:
103103

104104

105105
@pytest.fixture
106-
async def with_storage_celery_worker(
106+
async def with_api_server_celery_worker(
107107
app_environment: EnvVarsDict,
108108
celery_app: Celery,
109109
monkeypatch: pytest.MonkeyPatch,

services/api-server/tests/unit/celery/test_functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ async def test_with_fake_run_function(
124124
app: FastAPI,
125125
client: AsyncClient,
126126
auth: BasicAuth,
127-
with_storage_celery_worker: TestWorkController,
127+
with_api_server_celery_worker: TestWorkController,
128128
):
129129
app.dependency_overrides[get_function] = (
130130
lambda: RegisteredProjectFunction.model_validate(

services/api-server/tests/unit/test_tasks.py renamed to services/api-server/tests/unit/celery/test_tasks.py

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from typing import Any
55

66
import pytest
7+
from celery.contrib.testing.worker import TestWorkController
78
from faker import Faker
89
from fastapi import status
910
from httpx import AsyncClient, BasicAuth
@@ -19,6 +20,9 @@
1920
from pytest_simcore.helpers.async_jobs_server import AsyncJobSideEffects
2021
from simcore_service_api_server.models.schemas.base import ApiServerEnvelope
2122

23+
pytest_simcore_core_services_selection = ["postgres", "rabbit"]
24+
25+
2226
_faker = Faker()
2327

2428

@@ -64,26 +68,17 @@ def mocked_async_jobs_rpc_api(
6468

6569

6670
@pytest.mark.parametrize(
67-
"async_job_error, expected_status_code",
68-
[
69-
(None, status.HTTP_200_OK),
70-
(
71-
JobSchedulerError(
72-
exc=Exception("A very rare exception raised by the scheduler")
73-
),
74-
status.HTTP_500_INTERNAL_SERVER_ERROR,
75-
),
76-
],
71+
"expected_status_code",
72+
[status.HTTP_200_OK],
7773
)
78-
async def test_get_async_jobs(
74+
async def test_get_celery_tasks(
7975
client: AsyncClient,
80-
mocked_async_jobs_rpc_api: dict[str, MockType],
8176
auth: BasicAuth,
8277
expected_status_code: int,
78+
with_api_server_celery_worker: TestWorkController,
8379
):
8480

8581
response = await client.get("/v0/tasks", auth=auth)
86-
assert mocked_async_jobs_rpc_api["list_jobs"].called
8782
assert response.status_code == expected_status_code
8883

8984
if response.status_code == status.HTTP_200_OK:

0 commit comments

Comments
 (0)