Skip to content

Commit 2416227

Browse files
fix tests
1 parent d02fe75 commit 2416227

File tree

2 files changed

+24
-6
lines changed
  • services
    • storage/src/simcore_service_storage/modules/celery/backends
    • web/server/tests/unit/with_dbs/01/storage

2 files changed

+24
-6
lines changed

services/storage/src/simcore_service_storage/modules/celery/backends/_redis.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
from datetime import timedelta
33
from typing import Final
44

5-
from celery.result import AsyncResult # type: ignore[import-untyped]
5+
from celery.result import AsyncResult
6+
from common_library.async_tools import make_async # type: ignore[import-untyped]
67
from models_library.progress_bar import ProgressReport
78
from servicelib.redis._client import RedisClientSDK
89

@@ -51,7 +52,7 @@ async def create_task(
5152
)
5253

5354
async def exists_task(self, task_id: TaskID) -> bool:
54-
n = await self._redis_client_sdk.redis.exists(_build_key(task_id)) # type: ignore
55+
n = await self._redis_client_sdk.redis.exists(_build_key(task_id))
5556
assert isinstance(n, int) # nosec
5657
return n > 0
5758

@@ -96,10 +97,15 @@ async def list_tasks(self, task_context: TaskContext) -> list[Task]:
9697
if metadata is not None
9798
]
9899

99-
async def remove_task(self, task_id: TaskID) -> None:
100-
await self._redis_client_sdk.redis.delete(_build_key(task_id)) # type: ignore
100+
@make_async()
101+
@staticmethod
102+
def _forget_task(task_id: TaskID) -> None:
101103
AsyncResult(task_id).forget()
102104

105+
async def remove_task(self, task_id: TaskID) -> None:
106+
await self._redis_client_sdk.redis.delete(_build_key(task_id))
107+
await self._forget_task(task_id)
108+
103109
async def set_task_progress(self, task_id: TaskID, report: ProgressReport) -> None:
104110
await self._redis_client_sdk.redis.hset(
105111
name=_build_key(task_id),

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,12 @@ def side_effect(*args, **kwargs):
433433
"backend_result_or_exception, expected_status",
434434
[
435435
(
436-
(AsyncJobGet(job_id=AsyncJobId(f"{_faker.uuid4()}")), None),
436+
(
437+
AsyncJobGet(
438+
job_id=AsyncJobId(f"{_faker.uuid4()}"), job_name="export_data"
439+
),
440+
None,
441+
),
437442
status.HTTP_202_ACCEPTED,
438443
),
439444
(
@@ -594,6 +599,7 @@ async def test_get_async_job_result(
594599
[
595600
AsyncJobGet(
596601
job_id=AsyncJobId(_faker.uuid4()),
602+
job_name="task_name",
597603
)
598604
],
599605
status.HTTP_200_OK,
@@ -672,7 +678,13 @@ async def test_get_async_job_links(
672678
create_storage_rpc_client_mock(
673679
"simcore_service_webserver.storage._rest",
674680
start_export_data.__name__,
675-
(AsyncJobGet(job_id=AsyncJobId(f"{_faker.uuid4()}")), None),
681+
(
682+
AsyncJobGet(
683+
job_id=AsyncJobId(f"{_faker.uuid4()}"),
684+
job_name="export_data",
685+
),
686+
None,
687+
),
676688
)
677689

678690
_body = DataExportPost(

0 commit comments

Comments
 (0)