Skip to content

Commit 4a133f9

Browse files
fix
1 parent 6ccf7ef commit 4a133f9

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

services/director-v2/tests/integration/01/test_computation_api.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import asyncio
99
import json
10+
import uuid
1011
from collections.abc import Awaitable, Callable
1112
from copy import deepcopy
1213
from dataclasses import dataclass
@@ -169,6 +170,7 @@ def fake_workbench_computational_pipeline_details_not_started(
169170
"project_id": "16e60a5d-834e-4267-b44d-3af49171bf21",
170171
"product_name": "not a product",
171172
"product_api_base_url": "http://invalid",
173+
"collection_run_id": "16e60a5d-834e-4267-b44d-3af49171bf21",
172174
},
173175
status.HTTP_404_NOT_FOUND,
174176
),
@@ -979,6 +981,7 @@ async def test_pipeline_with_control_loop_made_of_dynamic_services_is_allowed(
979981
"start_pipeline": True,
980982
"product_name": osparc_product_name,
981983
"product_api_base_url": osparc_product_api_base_url,
984+
"collection_run_id": str(uuid.uuid4()),
982985
},
983986
)
984987
assert (
@@ -994,6 +997,7 @@ async def test_pipeline_with_control_loop_made_of_dynamic_services_is_allowed(
994997
"start_pipeline": False,
995998
"product_name": osparc_product_name,
996999
"product_api_base_url": osparc_product_api_base_url,
1000+
"collection_run_id": str(uuid.uuid4()),
9971001
},
9981002
)
9991003
assert (
@@ -1064,6 +1068,7 @@ async def test_pipeline_with_cycle_containing_a_computational_service_is_forbidd
10641068
"start_pipeline": True,
10651069
"product_name": osparc_product_name,
10661070
"product_api_base_url": osparc_product_api_base_url,
1071+
"collection_run_id": str(uuid.uuid4()),
10671072
},
10681073
)
10691074
assert (
@@ -1079,6 +1084,7 @@ async def test_pipeline_with_cycle_containing_a_computational_service_is_forbidd
10791084
"start_pipeline": False,
10801085
"product_name": osparc_product_name,
10811086
"product_api_base_url": osparc_product_api_base_url,
1087+
"collection_run_id": str(uuid.uuid4()),
10821088
},
10831089
)
10841090
assert (

services/director-v2/tests/integration/conftest.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# pylint: disable=unused-import
44

55
import asyncio
6+
import uuid
67
from collections.abc import AsyncIterator, Awaitable, Callable
78
from unittest.mock import AsyncMock
89

@@ -99,6 +100,7 @@ async def _creator(
99100
"start_pipeline": start_pipeline,
100101
"product_name": product_name,
101102
"product_api_base_url": product_api_base_url,
103+
"collection_run_id": str(uuid.uuid4()),
102104
**kwargs,
103105
},
104106
)

services/web/server/src/simcore_service_webserver/director_v2/_computations_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ async def list_computation_collection_run_tasks(
451451
started_at=item.started_at,
452452
ended_at=item.ended_at,
453453
log_download_link=item.log_download_link,
454-
name=( # type: ignore
454+
name=(
455455
custom_metadata.get("job_name")
456456
if custom_metadata.get("job_name")
457457
else project_uuid_to_workbench[f"{item.project_uuid}"][

0 commit comments

Comments
 (0)