From 17e935528d98a509e56c25be87ee73f98a66e027 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Tue, 28 Jan 2014 14:34:26 -0600
Subject: [PATCH] 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.

---
 scripts/functional_tests.py                 |  3 +--
 test/functional/tools/parallelism.xml       | 20 ++++++++++++++++++++
 test/functional/tools/samples_tool_conf.xml |  3 ++-
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 test/functional/tools/parallelism.xml

diff --git a/scripts/functional_tests.py b/scripts/functional_tests.py
index 64d8dcd3132..a99c7167ac5 100644
--- a/scripts/functional_tests.py
+++ b/scripts/functional_tests.py
@@ -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
diff --git a/test/functional/tools/parallelism.xml b/test/functional/tools/parallelism.xml
new file mode 100644
index 00000000000..b82ce19ea11
--- /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 --git a/test/functional/tools/samples_tool_conf.xml b/test/functional/tools/samples_tool_conf.xml
index 32716c0c974..c5e377c13db 100644
--- 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