mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
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.
This commit is contained in:
@@ -195,7 +195,9 @@ class ToolTestBuilder( object ):
|
||||
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' ]
|
||||
|
||||
@@ -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>
|
||||
@@ -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" />
|
||||
|
||||
Reference in New Issue
Block a user