Merge branch 'master' into fix-832

Author: mr-c

Makefile

@@ -134,12 +134,11 @@ coverage.html: htmlcov/index.html
 htmlcov/index.html: .coverage
 	coverage html
 
-diff-cover: coverage-gcovr.xml coverage.xml
-	diff-cover coverage-gcovr.xml coverage.xml
+diff-cover: coverage.xml
+	diff-cover $^
 
-diff-cover.html: coverage-gcovr.xml coverage.xml
-	diff-cover coverage-gcovr.xml coverage.xml \
-		--html-report diff-cover.html
+diff-cover.html:  coverage.xml
+	diff-cover $^ --html-report diff-cover.html
 
 ## test        : run the ${MODULE} test suite
 test: $(pysources)

cwltool/docker.py

@@ -22,10 +22,10 @@
 from .secrets import SecretStore  # pylint: disable=unused-import
 from .utils import (DEFAULT_TMP_PREFIX, docker_windows_path_adjust, onWindows,
                     subprocess)
-from .context import RuntimeContext
+from .context import RuntimeContext  # pylint: disable=unused-import
 
-found_images = set()  # type: Set[Text]
-found_images_lock = threading.Lock()
+_IMAGES = set()  # type: Set[Text]
+_IMAGES_LOCK = threading.Lock()
 __docker_machine_mounts = None  # type: Optional[List[Text]]
 __docker_machine_mounts_lock = threading.Lock()
 
@@ -91,8 +91,8 @@ def get_image(docker_requirement,     # type: Dict[Text, Text]
                 and "dockerPull" in docker_requirement:
             docker_requirement["dockerImageId"] = docker_requirement["dockerPull"]
 
-        with found_images_lock:
-            if docker_requirement["dockerImageId"] in found_images:
+        with _IMAGES_LOCK:
+            if docker_requirement["dockerImageId"] in _IMAGES:
                 return True
 
         for line in subprocess.check_output(
@@ -132,7 +132,7 @@ def get_image(docker_requirement,     # type: Dict[Text, Text]
             elif "dockerFile" in docker_requirement:
                 dockerfile_dir = str(tempfile.mkdtemp(prefix=tmp_outdir_prefix))
                 with open(os.path.join(
-                        dockerfile_dir, "Dockerfile"), "wb") as dfile:
+                    dockerfile_dir, "Dockerfile"), "wb") as dfile:
                     dfile.write(docker_requirement["dockerFile"].encode('utf-8'))
                 cmd = ["docker", "build", "--tag=%s" %
                        str(docker_requirement["dockerImageId"]), dockerfile_dir]
@@ -171,8 +171,8 @@ def get_image(docker_requirement,     # type: Dict[Text, Text]
                 found = True
 
         if found:
-            with found_images_lock:
-                found_images.add(docker_requirement["dockerImageId"])
+            with _IMAGES_LOCK:
+                _IMAGES.add(docker_requirement["dockerImageId"])
 
         return found
 
@@ -339,7 +339,7 @@ def create_runtime(self, env, runtimeContext):
 
         # add parameters to docker to write a container ID file
         if runtimeContext.record_container_id:
-            cidfile_dir = runtimeContext.cidfile_
+            cidfile_dir = runtimeContext.cidfile_dir
             if cidfile_dir != "":
                 if not os.path.isdir(cidfile_dir):
                     _logger.error("--cidfile-dir %s error:\n%s", cidfile_dir,

tests/test_examples.py

@@ -3,6 +3,7 @@
 import json
 import logging
 import shutil
+import os
 import sys
 import tempfile
 import unittest
@@ -643,6 +644,19 @@ def test_no_js_console(self):
             self.assertNotIn("[log] Log message", stderr)
             self.assertNotIn("[err] Error message", stderr)
 
+@needs_docker
+class TestRecordContainerId(TestCmdLine):
+    def test_record_container_id(self):
+        test_file = "cache_test_workflow.cwl"
+        cid_dir = tempfile.mkdtemp("cwltool_test_cid")
+        error_code, _, stderr = self.get_main_output(
+            ["--record-container-id", "--cidfile-dir", cid_dir,
+             get_data("tests/wf/" + test_file)])
+        self.assertIn("completed success", stderr)
+        self.assertEqual(error_code, 0)
+        self.assertEqual(len(os.listdir(cid_dir)), 2)
+        shutil.rmtree(cid_dir)
+
 
 @needs_docker
 class TestCache(TestCmdLine):