Fix label's on output collections.

Thanks to @kellrott for reporting the issue.

https://trello.com/c/Qc2A4rsw
This commit is contained in:
John Chilton
2015-05-14 16:33:39 -04:00
parent fbaba4b463
commit 4ad4688fde
2 changed files with 5 additions and 1 deletions
+2
View File
@@ -158,6 +158,7 @@ class XmlToolSource(ToolSource):
for collection_elem in out_elem.findall("collection"):
name = collection_elem.get( "name" )
label = xml_text( collection_elem, "label" )
default_format = collection_elem.get( "format", "data" )
collection_type = collection_elem.get( "type", None )
structured_like = collection_elem.get( "structured_like", None )
@@ -180,6 +181,7 @@ class XmlToolSource(ToolSource):
output_collection = galaxy.tools.ToolOutputCollection(
name,
structure,
label=label,
default_format=default_format,
inherit_format=inherit_format,
inherit_metadata=inherit_metadata,
+3 -1
View File
@@ -302,7 +302,7 @@ class ToolsTestCase( api.ApiTestCase ):
self._assert_has_keys( output_collection, "id", "name", "elements", "populated" )
assert not output_collection[ "populated" ]
assert len( output_collection[ "elements" ] ) == 0
self.assertEquals( output_collection[ "name" ], "Table split on first column" )
self.dataset_populator.wait_for_job( create["jobs"][0]["id"], assert_ok=True )
get_collection_response = self._get( "dataset_collections/%s" % output_collection[ "id" ], data={"instance_type": "history"} )
@@ -312,6 +312,8 @@ class ToolsTestCase( api.ApiTestCase ):
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
@skip_without_tool( "cat1" )