1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/4ddfe2108c00/ Changeset: 4ddfe2108c00 User: jmchilton Date: 2013-11-22 08:27:47 Summary: Add test case for data param with multiple=True even if just 1 file used. Add fix to twill driver to fix this use case. Affected #: 3 files

diff -r b2feff0cd2e7dbc3d9ba4b5bed55bd744406c6b1 -r 4ddfe2108c00f3ba6ff4eb097986297a2b5c98f2 test/base/twilltestcase.py --- a/test/base/twilltestcase.py +++ b/test/base/twilltestcase.py @@ -1305,7 +1305,15 @@ control.get( name=elem ).selected = True else: for elem in control_value: - control.get( name=elem ).selected = True + try: + # Doubt this case would ever work, but want + # to preserve backward compat. + control.get( name=elem ).selected = True + except Exception: + # ... anyway this is really what we want to + # do, probably even want to try the len( + # elem ) > 30 check below. + control.get( label=elem ).selected = True else: # control.is_of_kind( "singlelist" ) for elem in control_value: try:

diff -r b2feff0cd2e7dbc3d9ba4b5bed55bd744406c6b1 -r 4ddfe2108c00f3ba6ff4eb097986297a2b5c98f2 test/functional/tools/multi_data_param.xml --- /dev/null +++ b/test/functional/tools/multi_data_param.xml @@ -0,0 +1,30 @@ +<tool id="multi_data_param" name="multi_data_param" version="0.1.0"> + <command> + cat #for $f in $f1# ${f} #end for# >> $out1; + cat #for $f in $f2# ${f} #end for# >> $out2 + </command> + <inputs> + <param name="f1" type="data" format="txt" multiple="true" /> + <param name="f2" type="data" format="txt" multiple="true" /> + </inputs> + <outputs> + <data format="txt" name="out1" /> + <data format="txt" name="out2" /> + </outputs> + <tests> + <test> + <param name="f1" value="simple_line.txt" /> + <param name="f2" value="simple_line_alternative.txt" /> + <output name="out1" file="simple_line.txt" /> + <output name="out2" file="simple_line_alternative.txt" /> + </test> + <!-- TODO: Support this or something like this. + <test> + <param name="f1" value="simple_line.txt,simple_line.txt" /> + <param name="f2" value="simple_line_alternative.txt" /> + <output name="out1" file="simple_line_x2.txt" /> + <output name="out1" file="simple_line_alternative.txt" /> + </test> + --> + </tests> +</tool>

diff -r b2feff0cd2e7dbc3d9ba4b5bed55bd744406c6b1 -r 4ddfe2108c00f3ba6ff4eb097986297a2b5c98f2 test/functional/tools/samples_tool_conf.xml --- a/test/functional/tools/samples_tool_conf.xml +++ b/test/functional/tools/samples_tool_conf.xml @@ -14,4 +14,5 @@ <tool file="disambiguate_repeats.xml" /><tool file="min_repeat.xml" /><tool file="implicit_default_conds.xml" /> + <tool file="multi_data_param.xml" /></toolbox> \ No newline at end of file

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.