1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/0ab0eb81d982/ Changeset: 0ab0eb81d982 User: jmchilton Date: 2014-01-28 21:34:26 Summary: Add example tool with task splitting to tool functional framework tests. Enable task splitting in functional tests to test this. Specify tool_dir in samples tool_conf.xml so it doesn't need to be explicitly set in scripts/functional_tests.py. Affected #: 3 files
diff -r 377e35b0263867f25e757f423a8735f1409fa9c4 -r 0ab0eb81d9828b0527d68f404a36acc64359f5f8 scripts/functional_tests.py --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -223,8 +223,6 @@ tool_conf = os.path.join( framework_tool_dir, 'samples_tool_conf.xml' ) datatypes_conf_override = os.path.join( framework_tool_dir, 'sample_datatypes_conf.xml' ) test_dir = os.path.join( framework_tool_dir, 'test-data') - - tool_path = framework_tool_dir else: # Use tool_conf.xml toolbox. tool_conf = 'tool_conf.xml' @@ -373,6 +371,7 @@ use_heartbeat=False, user_library_import_dir=user_library_import_dir, master_api_key=master_api_key, + use_tasked_jobs=True, ) if install_database_connection is not None: kwargs[ 'install_database_connection' ] = install_database_connection
diff -r 377e35b0263867f25e757f423a8735f1409fa9c4 -r 0ab0eb81d9828b0527d68f404a36acc64359f5f8 test/functional/tools/parallelism.xml --- /dev/null +++ b/test/functional/tools/parallelism.xml @@ -0,0 +1,20 @@ +<tool id="parallelism" name="Split file line-by-line and rebuild 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"/> + </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 377e35b0263867f25e757f423a8735f1409fa9c4 -r 0ab0eb81d9828b0527d68f404a36acc64359f5f8 test/functional/tools/samples_tool_conf.xml --- a/test/functional/tools/samples_tool_conf.xml +++ b/test/functional/tools/samples_tool_conf.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<toolbox> +<toolbox tool_path="test/functional/tools"><tool file="upload.xml"/><tool file="simple_constructs.xml" /><tool file="composite.xml" /> @@ -13,6 +13,7 @@ <tool file="output_order.xml" /><tool file="disambiguate_repeats.xml" /><tool file="min_repeat.xml" /> + <tool file="parallelism.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.