Skip to content

Commit

Permalink
Make wait_for_history_jobs look at jobs, not datasets
Browse files Browse the repository at this point in the history
That fixes test_optional_workflow_output, which started failing after
galaxyproject#17874, which removed the
last static output of `output_filter`, and so there would never be any
active datasets to wait on.
  • Loading branch information
mvdbeek committed Apr 3, 2024
1 parent 3920f21 commit 8ab16a9
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/galaxy_test/base/populators.py
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,8 @@ def has_active_jobs():
raise TimeoutAssertionError(message)

if assert_ok:
self.wait_for_history(history_id, assert_ok=True, timeout=timeout)
for job in self.history_jobs(history_id=history_id):
assert job["state"] in ("ok", "skipped"), f"Job {job} not in expected state"

def wait_for_jobs(
self,
Expand Down

0 comments on commit 8ab16a9

Please sign in to comment.