Skip to content

Commit

Permalink
Make new tests robust to job order
Browse files Browse the repository at this point in the history
  • Loading branch information
mvdbeek committed Oct 26, 2022
1 parent 5268985 commit cdcac2c
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions lib/galaxy_test/api/test_workflows.py
Original file line number Diff line number Diff line change
Expand Up @@ -1895,7 +1895,7 @@ def test_workflow_metadata_validation_0(self):
history_id=history_id,
)

def test_run_workflow_simple_conditional(self):
def test_run_workflow_simple_conditional_step(self):
with self.dataset_populator.test_history() as history_id:
summary = self._run_workflow(
"""class: GalaxyWorkflow
Expand Down Expand Up @@ -1924,10 +1924,9 @@ def test_run_workflow_simple_conditional(self):
)
invocation_details = self.workflow_populator.get_invocation(summary.invocation_id, step_details=True)
conditional_jobs = invocation_details["steps"][2]["jobs"]
assert conditional_jobs[0]["state"] == "ok"
assert conditional_jobs[1]["state"] == "skipped"
assert sum(1 for j in conditional_jobs if j["state"] == "skipped") == 1

def test_run_workflow_conditional_map_over_expression_tool(self):
def test_run_workflow_conditional_step_map_over_expression_tool(self):
with self.dataset_populator.test_history() as history_id:
summary = self._run_workflow(
"""
Expand Down Expand Up @@ -1960,10 +1959,9 @@ def test_run_workflow_conditional_map_over_expression_tool(self):
)
invocation_details = self.workflow_populator.get_invocation(summary.invocation_id, step_details=True)
conditional_jobs = invocation_details["steps"][2]["jobs"]
assert conditional_jobs[0]["state"] == "ok"
assert conditional_jobs[1]["state"] == "skipped"
assert sum(1 for j in conditional_jobs if j["state"] == "skipped") == 1

def test_run_workflow_conditional_map_over_expression_tool_pick_value(self):
def test_run_workflow_conditional_step_map_over_expression_tool_pick_value(self):
with self.dataset_populator.test_history() as history_id:
summary = self._run_workflow(
"""
Expand Down Expand Up @@ -2052,7 +2050,7 @@ def test_run_workflow_conditional_map_over_expression_tool_pick_value(self):
assert content == "True"
consume_expression_parameter_2 = invocation_details["steps"][5]
assert consume_expression_parameter_2["workflow_step_label"] == "consume_expression_parameter_2"
assert consume_expression_parameter_2["jobs"][0]["state"] == "skipped"
assert sum(1 for j in consume_expression_parameter_2["jobs"] if j["state"] == "skipped") == 1

def test_run_subworkflow_simple(self) -> None:
with self.dataset_populator.test_history() as history_id:
Expand Down

0 comments on commit cdcac2c

Please sign in to comment.