1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/38f6cf2629ef/ Changeset: 38f6cf2629ef User: jmchilton Date: 2014-09-26 13:29:53+00:00 Summary: Tool test case demonstrating wrapping multiple data params in new meta-parameter wrapper. ./run_tests.sh -with_framework_test_tools -api test/api/test_tools.py:ToolsTestCase.test_multidata_param It was what was requested, but I am not sure I love this behavior - seems like for consistency that should maybe be a list of lists? I can see the other side of the argument though. Affected #: 1 file diff -r f52d7d6d64a671039a85959e1c720445f0ee672e -r 38f6cf2629efd071b4e7cc3e420a4e5081ad51e0 test/api/test_tools.py --- a/test/api/test_tools.py +++ b/test/api/test_tools.py @@ -106,6 +106,23 @@ output1_content = self.dataset_populator.get_history_dataset_content( history_id, dataset=output ) assert output1_content == "--ex1,ex2" + @skip_without_tool( "multi_data_param" ) + def test_multidata_param( self ): + history_id = self.dataset_populator.new_history() + hda1 = dataset_to_param( self.dataset_populator.new_dataset( history_id, content='1\t2\t3' ) ) + hda2 = dataset_to_param( self.dataset_populator.new_dataset( history_id, content='4\t5\t6' ) ) + inputs = { + "f1": { 'batch': False, 'values': [ hda1, hda2 ] }, + "f2": { 'batch': False, 'values': [ hda2, hda1 ] }, + } + response = self._run( "multi_data_param", history_id, inputs, assert_ok=True ) + output1 = response[ "outputs" ][ 0 ] + output2 = response[ "outputs" ][ 1 ] + output1_content = self.dataset_populator.get_history_dataset_content( history_id, dataset=output1 ) + output2_content = self.dataset_populator.get_history_dataset_content( history_id, dataset=output2 ) + assert output1_content == "1\t2\t3\n4\t5\t6\n", output1_content + assert output2_content == "4\t5\t6\n1\t2\t3\n", output2_content + @skip_without_tool( "cat1" ) def test_run_cat1( self ): # Run simple non-upload tool with an input data parameter. Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.