Merge pull request #28 from common-workflow-language/mkdtemp-lock

Add lock around mkdtemp, which seems to be thread-unsafe.

Author: mr-c

.travis.yml

@@ -1,12 +1,15 @@
 sudo: false
 language: python
-python:
-  - 2.7
-    #  - 3.4
-  - 3.5
-    #  - 3.6
-os:
-  - linux
+
+matrix:
+  include:
+    - os: linux
+      python: 2.7
+    - os: linux
+      python: 3.5
+    - os: osx
+      language: generic
+      python: 2.7
 
 install:
   - pip install tox-travis

cwltest/__init__.py

@@ -20,6 +20,7 @@
 import logging
 import schema_salad.ref_resolver
 import time
+import threading
 from concurrent.futures import ThreadPoolExecutor
 from typing import Any, Dict, List, Text
 
@@ -159,7 +160,11 @@ def compare(expected, actual):  # type: (Any, Any) -> None
         raise CompareFail(str(e))
 
 
+templock = threading.Lock()
+
 def run_test(args, i, tests):  # type: (argparse.Namespace, int, List[Dict[str, str]]) -> TestResult
+    global templock
+
     out = {}  # type: Dict[str,Any]
     outdir = outstr = outerr = test_command = None
     duration = 0.0
@@ -182,11 +187,12 @@ def run_test(args, i, tests):  # type: (argparse.Namespace, int, List[Dict[str,
                     test_command.extend([prefix, t[test_case_name]])
 
         # Add prefixes if running on MacOSX so that boot2docker writes to /Users
-        if 'darwin' in sys.platform and args.tool == 'cwltool':
-            outdir = tempfile.mkdtemp(prefix=os.path.abspath(os.path.curdir))
-            test_command.extend(["--tmp-outdir-prefix={}".format(outdir), "--tmpdir-prefix={}".format(outdir)])
-        else:
-            outdir = tempfile.mkdtemp()
+        with templock:
+            if 'darwin' in sys.platform and args.tool == 'cwltool':
+                outdir = tempfile.mkdtemp(prefix=os.path.abspath(os.path.curdir))
+                test_command.extend(["--tmp-outdir-prefix={}".format(outdir), "--tmpdir-prefix={}".format(outdir)])
+            else:
+                outdir = tempfile.mkdtemp()
         test_command.extend(["--outdir={}".format(outdir),
                              "--quiet",
                              t["tool"]])

tox.ini

@@ -3,9 +3,13 @@
 envlist = py27-lint, py27-unit, py35-mypy
 skipsdist = True
 
-[tox:travis]
-2.7 = py27
-3.5 = py35-mypy
+[travis]
+os =
+  linux: py{27,35}-{lint,unit}, py35-mypy
+  osx: py{27}-{lint,unit}
+python =
+  2.7: py27
+  3.5: py35-mypy
 
 [testenv]
 deps = -rrequirements.txt