Skip to content

Commit 131321e

Browse files
committed
revert changes
1 parent b479d1f commit 131321e

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

services/director-v2/src/simcore_service_director_v2/utils/dags.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ async def compute_pipeline_details(
256256
and node_id_to_comp_task[node_id].progress is not None
257257
else None
258258
),
259-
lock_state=None,
260259
)
261260
for node_id, node_data in complete_dag.nodes.data()
262261
if node_data["node_class"] is NodeClass.COMPUTATIONAL

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,6 @@ def _convert_to_pipeline_details(
433433
},
434434
currentStatus=s.get("currentStatus", RunningState.NOT_STARTED),
435435
progress=s.get("progress"),
436-
lock_state=None,
437436
)
438437
for n, s in exp_node_states.items()
439438
}

services/director-v2/tests/unit/test_utils_dags.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ def pipeline_test_params(
489489
adjacency_list={f"node_{x}": [] for x in range(_MANY_NODES)},
490490
progress=1.0,
491491
node_states={
492-
f"node_{x}": NodeState(modified=True, progress=1, lock_state=None)
492+
f"node_{x}": NodeState(modified=True, progress=1)
493493
for x in range(_MANY_NODES)
494494
},
495495
),
@@ -568,9 +568,9 @@ def pipeline_test_params(
568568
},
569569
progress=0.3333333333333333,
570570
node_states={
571-
"node_1": NodeState(modified=True, progress=None, lock_state=None),
572-
"node_2": NodeState(modified=True, progress=None, lock_state=None),
573-
"node_3": NodeState(modified=True, progress=1, lock_state=None),
571+
"node_1": NodeState(modified=True, progress=None),
572+
"node_2": NodeState(modified=True, progress=None),
573+
"node_3": NodeState(modified=True, progress=1),
574574
},
575575
),
576576
id="proper dag",
@@ -653,13 +653,12 @@ async def test_compute_pipeline_details(
653653
},
654654
progress=0.0,
655655
node_states={
656-
"node_1": NodeState(modified=True, progress=None, lock_state=None),
657-
"node_2": NodeState(modified=True, progress=None, lock_state=None),
656+
"node_1": NodeState(modified=True, progress=None),
657+
"node_2": NodeState(modified=True, progress=None),
658658
"node_3": NodeState(
659659
modified=True,
660660
progress=None,
661661
current_status=RunningState.UNKNOWN,
662-
lock_state=None,
663662
),
664663
},
665664
),

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_api_route_computations.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,6 @@ async def test_get_computation_from_not_started_computation_task(
953953
for node, next_nodes in fake_workbench_adjacency.items()
954954
if f"{t.node_id}" in next_nodes
955955
},
956-
lock_state=None,
957956
)
958957
for t in comp_tasks
959958
if t.node_class == NodeClass.COMPUTATIONAL
@@ -1026,7 +1025,6 @@ async def test_get_computation_from_published_computation_task(
10261025
if f"{t.node_id}" in next_nodes
10271026
},
10281027
progress=0,
1029-
lock_state=None,
10301028
)
10311029
for t in comp_tasks
10321030
if t.node_class == NodeClass.COMPUTATIONAL

0 commit comments

Comments
 (0)