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.
This commit is contained in:
John Chilton
2014-01-28 14:34:26 -06:00
parent d71ad70307
commit 17e935528d
3 changed files with 23 additions and 3 deletions
+1 -2
View File
@@ -223,8 +223,6 @@ def main():
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 @@ def main():
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
+20
View File
@@ -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>
+2 -1
View File
@@ -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>