Skip to content

Commit 69697c9

Browse files
author
Andrei Neagu
committed
fixed broken tests
1 parent 1d81ced commit 69697c9

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

packages/models-library/src/models_library/api_schemas_long_running_tasks/tasks.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,15 @@ class TaskBase(BaseModel):
2727

2828
@field_validator("task_name", mode="before")
2929
@classmethod
30-
def populate_task_name(cls, _, info):
31-
task_name = ""
30+
def populate_task_name(cls, task_id, info):
31+
task_name = task_id
32+
33+
# attempt to solve the task name from the task_id
34+
# if this is coming form a long_running_task
3235
task_id = info.data.get("task_id")
3336
if task_id:
3437
parts = task_id.split(".")
35-
if len(parts) >= 1:
38+
if len(parts) >= 2:
3639
task_name = parts[1]
3740

3841
return urllib.parse.unquote(task_name)

services/dynamic-sidecar/tests/unit/test_api_rest_containers_long_running_tasks.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
from servicelib.fastapi.long_running_tasks.client import Client, periodic_task_result
3232
from servicelib.fastapi.long_running_tasks.client import setup as client_setup
3333
from servicelib.long_running_tasks.models import TaskId
34+
from servicelib.long_running_tasks.task import TaskRegistry
3435
from simcore_sdk.node_ports_common.exceptions import NodeNotFound
3536
from simcore_service_dynamic_sidecar._meta import API_VTAG
3637
from simcore_service_dynamic_sidecar.api.rest import containers_long_running_tasks
@@ -75,6 +76,8 @@ def mock_tasks(mocker: MockerFixture) -> Iterator[None]:
7576
async def _just_log_task(*args, **kwargs) -> None:
7677
print(f"Called mocked function with {args}, {kwargs}")
7778

79+
TaskRegistry.register(_just_log_task)
80+
7881
# searching by name since all start with _task
7982
tasks_names = [
8083
x[0]
@@ -89,6 +92,8 @@ async def _just_log_task(*args, **kwargs) -> None:
8992

9093
yield None
9194

95+
TaskRegistry.unregister(_just_log_task)
96+
9297

9398
@asynccontextmanager
9499
async def auto_remove_task(client: Client, task_id: TaskId) -> AsyncIterator[None]:

0 commit comments

Comments
 (0)