Fix failing test.

lib/galaxy/tools/execute.py

@@ -6,10 +6,13 @@ collections from matched collections.
 import collections
 import logging
 
+from boltons.iterutils import remap
+
 from galaxy import model
 from galaxy.model.dataset_collections.structure import get_structure, tool_output_to_structure
 from galaxy.tool_util.parser import ToolOutputCollectionPart
 from galaxy.tools.actions import filter_output, on_text_for_names, ToolExecutionCache
+from galaxy.tools.parameters.basic import is_runtime_value
 
 log = logging.getLogger(__name__)
 
@@ -286,8 +289,24 @@ class ExecutionTracker:
         implicit_inputs = self.implicit_inputs
 
         implicit_collection_jobs = model.ImplicitCollectionJobs()
+
+        # trying to guess these filters at the collection levell is tricky because
+        # the filter condition could vary from element to element. Just do best we
+        # we can for now.
+        example_params = self.example_params.copy()
+
+        # walk through and optional replace runtime values with None, assume they
+        # would have been replaced by now if they were going to be set.
+        def replace_optional_runtime_values(path, key, value):
+
+            if is_runtime_value(value):
+                return key, None
+            return key, value
+
+        example_params = remap(example_params, visit=replace_optional_runtime_values)
+
         for output_name, output in self.tool.outputs.items():
-            if filter_output(output, self.example_params):
+            if filter_output(output, example_params):
                 continue
             output_collection_name = self.output_name(trans, history, params, output)
             effective_structure = self._mapped_output_structure(trans, output)

lib/galaxy_test/api/test_workflows.py

@@ -2913,9 +2913,13 @@ steps:
 """, test_data=test_data, history_id=history_id, wait=False)
             self.wait_for_invocation_and_jobs(history_id, run_object.workflow_id, run_object.invocation_id)
             contents = self.__history_contents(history_id)
-            assert len(contents) == 1
-            okay_dataset = contents[0]
-            assert okay_dataset["state"] == "ok"
+            assert len(contents) == 4
+            for content in contents:
+                if content["history_content_type"] == "dataset":
+                    assert content["state"] == "ok"
+                else:
+                    print(content)
+                    assert content["populated_state"] == "ok"
 
     @skip_without_tool("cat")
     def test_run_rename_on_mapped_over_collection(self):