Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[24.0] Make wait_for_history_jobs look at jobs, not datasets #17892

Merged
merged 3 commits into from
Apr 3, 2024
Merged

[24.0] Make wait_for_history_jobs look at jobs, not datasets #17892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ab16a9
Make wait_for_history_jobs look at jobs, not datasets
mvdbeek Apr 3, 2024
1332eb1
Fix ``test_workflow_optional_input_filtering`` API test to produce on…
nsoranzo Apr 3, 2024
4984523
Change test with no outputs to not fail
nsoranzo Apr 3, 2024
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
2 changes: 1 addition & 1 deletion lib/galaxy_test/api/test_workflows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5477,7 +5477,7 @@ def test_optional_workflow_output(self):
tool_id: output_filter
state:
produce_out_1: False
filter_text_1: '1'
filter_text_1: 'foo'
produce_collection: False
""",
test_data={},
Expand Down
3 changes: 2 additions & 1 deletion lib/galaxy_test/base/populators.py
View file
Open in desktop
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
8 changes: 1 addition & 7 deletions test/functional/tools/output_filter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,9 @@ echo 'p2.reverse' > p2.reverse
</assert_contents>
</output>
</test>
<!-- tool runs with no outputs should fail -->
<test expect_num_outputs="0" expect_test_failure="true">
<test expect_num_outputs="0">
<param name="produce_out_1" value="false" />
<param name="filter_text_1" value="not_foo_or_bar" />
<output name="out_3">
<assert_contents>
<has_line line="test" />
</assert_contents>
</output>
<assert_stdout>
<has_n_lines n="0"/>
</assert_stdout>
Expand Down
Loading