details: http://www.bx.psu.edu/hg/galaxy/rev/61f1ec6c5b24 changeset: 3224:61f1ec6c5b24 user: Greg Von Kuster <greg@bx.psu.edu> date: Mon Jan 11 16:35:16 2010 -0500 description: Enhance test framework to handle testing multiple outputs from tools. diffstat: test/functional/test_toolbox.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r 658bfde702a1 -r 61f1ec6c5b24 test/functional/test_toolbox.py --- a/test/functional/test_toolbox.py Mon Jan 11 13:26:00 2010 -0500 +++ b/test/functional/test_toolbox.py Mon Jan 11 16:35:16 2010 -0500 @@ -60,9 +60,9 @@ page_inputs = self.__expand_grouping(testdef.tool.inputs_by_page[i], all_inputs) self.submit_form( **page_inputs ) print "page_inputs (%i)" % i, page_inputs - # Check the result - assert len( testdef.outputs ) == 1, "ToolTestCase does not deal with multiple outputs properly yet." - for name, file, sort in testdef.outputs: + # Check the results ( handles single or multiple tool outputs ) + for output_tuple in testdef.outputs: + name, file, sort = output_tuple self.verify_dataset_correctness( file, maxseconds=testdef.maxseconds, sort=sort ) self.delete_history( id=self.security.encode_id( latest_history.id ) )