From 8ab16a9f6f4455950df58a4192b0d1f5d32cc165 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Wed, 3 Apr 2024 13:23:36 +0200
Subject: [PATCH 1/3] Make wait_for_history_jobs look at jobs, not datasets

That fixes test_optional_workflow_output, which started failing after
https://github.com/galaxyproject/galaxy/pull/17874, which removed the
last static output of `output_filter`, and so there would never be any
active datasets to wait on.
---
 lib/galaxy_test/base/populators.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

From 1332eb162006b09a5a03fd8f371cd7458e2bf128 Mon Sep 17 00:00:00 2001
From: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: Wed, 3 Apr 2024 13:10:53 +0100
Subject: [PATCH 2/3] Fix ``test_workflow_optional_input_filtering`` API test
 to produce one output again

---
 lib/galaxy_test/api/test_workflows.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/galaxy_test/api/test_workflows.py b/lib/galaxy_test/api/test_workflows.py
index f8e1cb85ca6e..3c91c601b523 100644
--- 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={},

From 4984523c39f89380315db46a174791a01769575c Mon Sep 17 00:00:00 2001
From: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: Wed, 3 Apr 2024 13:11:33 +0100
Subject: [PATCH 3/3] Change test with no outputs to not fail

``out_3`` has been removed in https://github.com/galaxyproject/galaxy/pull/17874 .
---
 test/functional/tools/output_filter.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/test/functional/tools/output_filter.xml b/test/functional/tools/output_filter.xml
index 4a891399210d..584f2f43cf3f 100644
--- 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>