1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/c53fbb2655e2/ Changeset: c53fbb2655e2 User: jmchilton Date: 2014-03-17 02:41:42 Summary: Add tool functional test for parallelism with optional inputs. This functionality is broken without patch from pull request #334. To run this broken test: % # First two exports are optional but speed up testing and force newest test framework. % export GALAXY_TEST_DEFAULT_INTERACTOR=api; % export GALAXY_TEST_DB_TEMPLATE=https://github.com/jmchilton/galaxy-bootstrap/raw/master/src/main/resources/... % ./run_functional_tests.sh -framework -id parallelism_optional Affected #: 2 files diff -r 11e83ed03dab7f658e3b08e29be25768f3546c72 -r c53fbb2655e2756c8977782df2381d883c5aa8af test/functional/tools/parallelism_optional.xml --- /dev/null +++ b/test/functional/tools/parallelism_optional.xml @@ -0,0 +1,21 @@ +<tool id="parallelism_optional" name="Split file line-by-line and rebuild dataset (with optional dataset)"> + <parallelism method="multi" split_inputs="input1" split_mode="to_size" split_size="1" merge_outputs="out_file1" /> + <command> + cat $input1 > $out_file1 + </command> + <inputs> + <param name="input1" type="data" label="Dataset"/> + <param name="input2" type="data" label="Optional Dataset" optional="true" /> + </inputs> + <outputs> + <data name="out_file1" format="txt" /> + </outputs> + <tests> + <test> + <param name="input1" value="simple_line_x2.txt"/> + <output name="out_file1" file="simple_line_x2.txt" /> + </test> + </tests> + <help> + </help> +</tool> diff -r 11e83ed03dab7f658e3b08e29be25768f3546c72 -r c53fbb2655e2756c8977782df2381d883c5aa8af test/functional/tools/samples_tool_conf.xml --- a/test/functional/tools/samples_tool_conf.xml +++ b/test/functional/tools/samples_tool_conf.xml @@ -14,6 +14,7 @@ <tool file="disambiguate_repeats.xml" /><tool file="min_repeat.xml" /><tool file="parallelism.xml" /> + <tool file="parallelism_optional.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.