Merge pull request #17892 from mvdbeek/fix_assert_ok

[24.0] Make `wait_for_history_jobs` look at jobs, not datasets
galaxyproject · Apr 3, 2024 · ab2aa7d · ab2aa7d
2 parents 4bb7dd0 + 4984523
commit ab2aa7d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/lib/galaxy_test/api/test_workflows.py b/lib/galaxy_test/api/test_workflows.py
@@ -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={},

diff --git a/lib/galaxy_test/base/populators.py b/lib/galaxy_test/base/populators.py
@@ -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,

diff --git a/test/functional/tools/output_filter.xml b/test/functional/tools/output_filter.xml
@@ -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>