Skip to content

Commit

Permalink
made code more readable
Browse files Browse the repository at this point in the history
  • Loading branch information
@LanderOtto
LanderOtto committed Jan 6, 2024
1 parent 91644b3 commit 89ee4a0
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 45 deletions.
49 changes: 23 additions & 26 deletions tests/test_change_wf.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Type, cast, MutableSequence
from typing import Type, cast

import pytest

Expand All @@ -20,10 +20,7 @@
GatherStep,
ScatterStep,
)
from tests.conftest import (
are_equals,
object_to_dict,
)
from tests.conftest import are_equals
from tests.utils.workflow import (
create_workflow,
create_schedule_step,
Expand Down Expand Up @@ -52,8 +49,8 @@ async def _base_step_test_process(
for p in new_workflow.ports.values():
p.persistent_id = None
p.workflow = None
_set_val_to_attributes(step, ["persistent_id", "workflow"], None)
_set_val_to_attributes(new_step, ["persistent_id", "workflow"], None)
_set_to_none(step, id_to_none=True, wf_to_none=True)
_set_to_none(new_step, id_to_none=True, wf_to_none=True)
assert are_equals(step, new_step)
return None, None, None
else:
Expand Down Expand Up @@ -93,8 +90,8 @@ async def _general_test_port(context: StreamFlowContext, cls_port: Type[Port]):
new_workflow.ports[new_port.name] = new_port
await new_workflow.save(context)
_persistent_id_test(workflow, new_workflow, port, new_port)
_set_val_to_attributes(port, ["persistent_id", "workflow"], None)
_set_val_to_attributes(new_port, ["persistent_id", "workflow"], None)
_set_to_none(port, id_to_none=True, wf_to_none=True)
_set_to_none(new_port, id_to_none=True, wf_to_none=True)
assert are_equals(port, new_port)


Expand All @@ -110,11 +107,11 @@ def _persistent_id_test(original_workflow, new_workflow, original_elem, new_elem
assert new_elem.workflow.persistent_id == new_workflow.persistent_id


def _set_val_to_attributes(elem, str_attributes: MutableSequence[str], val):
attrs = object_to_dict(elem)
for attr in str_attributes:
if attr in attrs.keys():
setattr(elem, attr, val)
def _set_to_none(elem, id_to_none=False, wf_to_none=False):
if id_to_none:
elem.persistent_id = None
if wf_to_none:
elem.workflow = None


def _set_workflow_in_combinator(combinator, workflow):
Expand Down Expand Up @@ -194,10 +191,10 @@ async def test_execute_step(context: StreamFlowContext):
original_processor.workflow.persistent_id
!= new_processor.workflow.persistent_id
)
_set_val_to_attributes(original_processor, ["workflow"], None)
_set_val_to_attributes(new_processor, ["workflow"], None)
_set_val_to_attributes(step, ["persistent_id", "workflow"], None)
_set_val_to_attributes(new_step, ["persistent_id", "workflow"], None)
_set_to_none(original_processor, wf_to_none=True)
_set_to_none(new_processor, wf_to_none=True)
_set_to_none(step, id_to_none=True, wf_to_none=True)
_set_to_none(new_step, id_to_none=True, wf_to_none=True)
assert are_equals(step, new_step)


Expand Down Expand Up @@ -227,10 +224,10 @@ async def test_schedule_step(context: StreamFlowContext):
):
# Config are read-only so workflows can share the same
assert original_filter.persistent_id == new_filter.persistent_id
_set_val_to_attributes(original_filter, ["persistent_id", "workflow"], None)
_set_val_to_attributes(new_filter, ["persistent_id", "workflow"], None)
_set_val_to_attributes(step, ["persistent_id", "workflow"], None)
_set_val_to_attributes(new_step, ["persistent_id", "workflow"], None)
_set_to_none(original_filter, id_to_none=True, wf_to_none=True)
_set_to_none(new_filter, id_to_none=True, wf_to_none=True)
_set_to_none(step, id_to_none=True, wf_to_none=True)
_set_to_none(new_step, id_to_none=True, wf_to_none=True)
assert are_equals(step, new_step)


Expand Down Expand Up @@ -273,8 +270,8 @@ async def test_combinator_step(context: StreamFlowContext, combinator: Combinato
new_workflow, new_step = await _clone_step(step, workflow, context)
_persistent_id_test(workflow, new_workflow, step, new_step)

_set_val_to_attributes(step, ["persistent_id", "workflow"], None)
_set_val_to_attributes(new_step, ["persistent_id", "workflow"], None)
_set_to_none(step, id_to_none=True, wf_to_none=True)
_set_to_none(new_step, id_to_none=True, wf_to_none=True)
_workflow_in_combinator_test(step.combinator, new_step.combinator)
_set_workflow_in_combinator(step.combinator, None)
_set_workflow_in_combinator(new_step.combinator, None)
Expand Down Expand Up @@ -305,8 +302,8 @@ async def test_loop_combinator_step(context: StreamFlowContext):
new_workflow, new_step = await _clone_step(step, workflow, context)
_persistent_id_test(workflow, new_workflow, step, new_step)

_set_val_to_attributes(step, ["persistent_id", "workflow"], None)
_set_val_to_attributes(new_step, ["persistent_id", "workflow"], None)
_set_to_none(step, id_to_none=True, wf_to_none=True)
_set_to_none(new_step, id_to_none=True, wf_to_none=True)
_workflow_in_combinator_test(step.combinator, new_step.combinator)
_set_workflow_in_combinator(step.combinator, None)
_set_workflow_in_combinator(new_step.combinator, None)
Expand Down
36 changes: 17 additions & 19 deletions tests/test_cwl_change_wf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,13 @@
ValueFromTransformer,
)
from streamflow.workflow.step import CombinatorStep
from tests.conftest import (
are_equals,
)
from tests.conftest import are_equals
from tests.test_change_wf import (
_persistent_id_test,
_set_val_to_attributes,
_base_step_test_process,
_persistent_id_test,
_set_workflow_in_combinator,
_workflow_in_combinator_test,
_set_to_none,
)
from tests.utils.workflow import create_workflow

Expand Down Expand Up @@ -85,14 +83,14 @@ async def test_value_from_transformer(context: StreamFlowContext):
context,
test_are_eq=False,
)
_set_val_to_attributes(step, ["persistent_id", "workflow"], None)
_set_val_to_attributes(new_step, ["persistent_id", "workflow"], None)
_set_to_none(step, id_to_none=True, wf_to_none=True)
_set_to_none(new_step, id_to_none=True, wf_to_none=True)
assert (
step.processor.workflow.persistent_id
!= new_step.processor.workflow.persistent_id
)
_set_val_to_attributes(step.processor, ["workflow"], None)
_set_val_to_attributes(new_step.processor, ["workflow"], None)
_set_to_none(step.processor, wf_to_none=True)
_set_to_none(new_step.processor, wf_to_none=True)
assert are_equals(step, new_step)


Expand Down Expand Up @@ -161,14 +159,14 @@ async def test_cwl_token_transformer(context: StreamFlowContext):
context,
test_are_eq=False,
)
_set_val_to_attributes(step, ["persistent_id", "workflow"], None)
_set_val_to_attributes(new_step, ["persistent_id", "workflow"], None)
_set_to_none(step, id_to_none=True, wf_to_none=True)
_set_to_none(new_step, id_to_none=True, wf_to_none=True)
assert (
step.processor.workflow.persistent_id
!= new_step.processor.workflow.persistent_id
)
_set_val_to_attributes(step.processor, ["workflow"], None)
_set_val_to_attributes(new_step.processor, ["workflow"], None)
_set_to_none(step.processor, id_to_none=True, wf_to_none=True)
_set_to_none(new_step.processor, id_to_none=True, wf_to_none=True)
assert are_equals(step, new_step)


Expand Down Expand Up @@ -271,8 +269,8 @@ async def test_list_merge_combinator(context: StreamFlowContext):
)
_persistent_id_test(workflow, new_workflow, step, new_step)

_set_val_to_attributes(step, ["persistent_id", "workflow"], None)
_set_val_to_attributes(new_step, ["persistent_id", "workflow"], None)
_set_to_none(step, id_to_none=True, wf_to_none=True)
_set_to_none(new_step, id_to_none=True, wf_to_none=True)
_workflow_in_combinator_test(step.combinator, new_step.combinator)
_set_workflow_in_combinator(step.combinator, None)
_set_workflow_in_combinator(new_step.combinator, None)
Expand Down Expand Up @@ -301,14 +299,14 @@ async def test_loop_value_from_transformer(context: StreamFlowContext):
)
_persistent_id_test(workflow, new_workflow, step, new_step)

_set_val_to_attributes(step, ["persistent_id", "workflow"], None)
_set_val_to_attributes(new_step, ["persistent_id", "workflow"], None)
_set_to_none(step, id_to_none=True, wf_to_none=True)
_set_to_none(new_step, id_to_none=True, wf_to_none=True)
assert (
step.processor.workflow.persistent_id
!= new_step.processor.workflow.persistent_id
)
_set_val_to_attributes(step.processor, ["workflow"], None)
_set_val_to_attributes(new_step.processor, ["workflow"], None)
_set_to_none(step.processor, id_to_none=True, wf_to_none=True)
_set_to_none(new_step.processor, id_to_none=True, wf_to_none=True)
assert are_equals(step, new_step)


Expand Down

0 comments on commit 89ee4a0

Please sign in to comment.