1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a74d32014b05/ Changeset: a74d32014b05 Branch: next-stable User: jmchilton Date: 2014-12-17 14:38:49+00:00 Summary: Fix gz/zip upload of files to test framework. With test case to ensure they don't break again. Problem was due to a small switch of an if to an elif in 7114d15a6d22 which had been sort of masking over an older bug. Thanks to Peter Cock for reporting the issue. Affected #: 3 files diff -r 31f0b0cbb4ef7d2af357bbe43a77127d7b546c5a -r a74d32014b0512613042c2a44d0b946703a1fbcd lib/galaxy/tools/test.py --- a/lib/galaxy/tools/test.py +++ b/lib/galaxy/tools/test.py @@ -195,7 +195,9 @@ if isinstance( value, basic.DataToolParameter ): if not isinstance(param_value, list): param_value = [ param_value ] - processed_value = [ self.__add_uploaded_dataset( context.for_state(), v, param_extra, value ) for v in param_value ] + map( lambda v: self.__add_uploaded_dataset( context.for_state(), v, param_extra, value ), +param_value ) + processed_value = param_value elif isinstance( value, basic.DataCollectionToolParameter ): assert 'collection' in param_extra collection_def = param_extra[ 'collection' ] diff -r 31f0b0cbb4ef7d2af357bbe43a77127d7b546c5a -r a74d32014b0512613042c2a44d0b946703a1fbcd test/functional/tools/gzipped_inputs.xml --- /dev/null +++ b/test/functional/tools/gzipped_inputs.xml @@ -0,0 +1,19 @@ +<tool id="gzipped_inputs" name="Echo Dataset"> + <command> + cat $input1 > $out_file1 + </command> + <inputs> + <param name="input1" type="data" label="Concatenate Dataset"/> + </inputs> + <outputs> + <data name="out_file1" format="input" metadata_source="input1"/> + </outputs> + <tests> + <test> + <param name="input1" value="4.bed.gz" /> + <output name="out_file1" file="4.bed" /> + </test> + </tests> + <help> + </help> +</tool> diff -r 31f0b0cbb4ef7d2af357bbe43a77127d7b546c5a -r a74d32014b0512613042c2a44d0b946703a1fbcd test/functional/tools/samples_tool_conf.xml --- a/test/functional/tools/samples_tool_conf.xml +++ b/test/functional/tools/samples_tool_conf.xml @@ -11,6 +11,7 @@ <tool file="multi_output_configured.xml" /><tool file="composite_output.xml" /><tool file="metadata.xml" /> + <tool file="gzipped_inputs.xml" /><tool file="output_order.xml" /><tool file="output_format.xml" /><tool file="output_filter.xml" /> 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.