From c3687114d6f2f14df49af9a3fee6dbebe08aa7e5 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 5 Jan 2017 09:07:16 -0500 Subject: [PATCH] Set metadata on HDAs from dynamically discovered collections. With test case that previously failed. Fixes #3267. --- lib/galaxy/tools/parameters/output_collect.py | 3 +++ test/api/test_tools.py | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/tools/parameters/output_collect.py b/lib/galaxy/tools/parameters/output_collect.py index 1fb52296c77..60875c0fae6 100644 --- a/lib/galaxy/tools/parameters/output_collect.py +++ b/lib/galaxy/tools/parameters/output_collect.py @@ -205,6 +205,9 @@ class JobContext( object ): else: primary_data.init_meta() + primary_data.set_meta() + primary_data.set_peek() + return primary_data diff --git a/test/api/test_tools.py b/test/api/test_tools.py index 82e310b06a9..672e6ff9960 100644 --- a/test/api/test_tools.py +++ b/test/api/test_tools.py @@ -465,10 +465,14 @@ class ToolsTestCase( api.ApiTestCase ): output_collection = get_collection_response.json() self._assert_has_keys( output_collection, "id", "name", "elements", "populated" ) assert output_collection[ "populated" ] - assert len( output_collection[ "elements" ] ) == 2 self.assertEquals( output_collection[ "name" ], "Table split on first column" ) - # TODO: verify element identifiers + assert len( output_collection[ "elements" ] ) == 2 + output_element_0 = output_collection["elements"][0] + assert output_element_0["element_index"] == 0 + assert output_element_0["element_identifier"] == "samp1" + output_element_hda_0 = output_element_0["object"] + assert output_element_hda_0["metadata_column_types"] is not None @skip_without_tool( "cat1" ) def test_run_cat1_with_two_inputs( self ):