Add tests for MultithreadedJobExecutor

Author: Anton Khodak

tests/test_parallel.py

@@ -0,0 +1,27 @@
+import json
+import unittest
+
+import cwltool
+import cwltool.factory
+from cwltool.executors import MultithreadedJobExecutor
+from tests.util import get_data
+
+
+class TestParallel(unittest.TestCase):
+    def test_sequential_workflow(self):
+        test_file = "tests/wf/count-lines1-wf.cwl"
+        f = cwltool.factory.Factory(executor=MultithreadedJobExecutor())
+        echo = f.make(get_data(test_file))
+        self.assertEqual(echo(file1= {
+                "class": "File",
+                "location": "tests/wf/whale.txt"
+            }),
+            {"count_output": 16})
+
+    def test_scattered_workflow(self):
+        test_file = "tests/wf/scatter-wf4.cwl"
+        job_file = "tests/wf/scatter-job2.json"
+        f = cwltool.factory.Factory(executor=MultithreadedJobExecutor())
+        echo = f.make(get_data(test_file))
+        with open(get_data(job_file)) as job:
+            self.assertEqual(echo(**json.load(job)), {'out': ['foo one three', 'foo two four']})

tests/wf/count-lines1-wf.cwl

@@ -1,4 +1,3 @@
-#!/usr/bin/env cwl-runner
 class: Workflow
 cwlVersion: v1.0
 

tests/wf/scatter-job2.json

@@ -0,0 +1,4 @@
+{
+    "inp1": ["one", "two"],
+    "inp2": ["three", "four"]
+}

tests/wf/scatter-wf4.cwl

@@ -0,0 +1,46 @@
+#!/usr/bin/env cwl-runner
+cwlVersion: v1.0
+$graph:
+- id: echo
+  class: CommandLineTool
+  inputs:
+    echo_in1:
+      type: string
+      inputBinding: {}
+    echo_in2:
+      type: string
+      inputBinding: {}
+  outputs:
+    echo_out:
+      type: string
+      outputBinding:
+        glob: "step1_out"
+        loadContents: true
+        outputEval: $(self[0].contents)
+  baseCommand: "echo"
+  arguments: ["-n", "foo"]
+  stdout: step1_out
+
+- id: main
+  class: Workflow
+  inputs:
+    inp1: string[]
+    inp2: string[]
+  requirements:
+    - class: ScatterFeatureRequirement
+  steps:
+    step1:
+      scatter: [echo_in1, echo_in2]
+      scatterMethod: dotproduct
+      in:
+        echo_in1: inp1
+        echo_in2: inp2
+      out: [echo_out]
+      run: "#echo"
+
+  outputs:
+    - id: out
+      outputSource: step1/echo_out
+      type:
+        type: array
+        items: string