Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions tests/test_decoder.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ def test_get_required_variable_names_for_simnple_python_molprops_with_options():
assert "rdkitPropertyValue" in rqd_variables


@pytest.mark.skip(reason="The decoder does not currently handle options processing")
def test_set_variables_from_options_for_step_for_simnple_python_molprops_with_options():
# Arrange
variables = {
Expand All @@ -244,15 +243,14 @@ def test_set_variables_from_options_for_step_for_simnple_python_molprops_with_op
}

# Act
new_variables, error = decoder.set_variables_from_options_for_step(
new_variables = decoder.set_variables_from_options_for_step(
_SIMPLE_PYTHON_MOLPROPS_WITH_OPTIONS_WORKFLOW,
variables,
"step1",
)

# Assert
assert error is None
assert len(new_variables) == 4
assert len(new_variables) == 2
assert "name" in new_variables
assert "value" in new_variables
assert new_variables["name"] == "propertyName"
Expand Down
1 change: 0 additions & 1 deletion tests/test_workflow_engine_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@ def test_workflow_engine_simple_python_molprops(basic_engine):
assert project_file_exists(output_file_2)


# @pytest.mark.skip(reason="The engine does not currently create the required variables")
def test_workflow_engine_simple_python_molprops_with_options(basic_engine):
# Arrange
da, md = basic_engine
Expand Down
5 changes: 0 additions & 5 deletions workflow/decoder.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,8 @@ def set_variables_from_options_for_step(
assert isinstance(definition, dict)
assert step_name

print("workflow", definition)
print("workflow_variables", variables)

result = {}
options = definition.get("variables", {}).get("options", [])
print("options", options)
print("variables", variables)

for opt in options:
for step_alias in opt["as"]:
Expand Down