fix cid default bug (#971)

* synchronize default value of cidfile_{dir,prefix}

Author: mr-c

cwltool/argparser.py

@@ -58,13 +58,13 @@ def arg_parser():  # type: () -> argparse.ArgumentParser
     cidgroup.add_argument(
         "--cidfile-dir", type=Text, help="Directory for storing the Docker "
         "container ID file. The default is the current directory",
-        default="", dest="cidfile_dir")
+        default=None, dest="cidfile_dir")
 
     cidgroup.add_argument(
         "--cidfile-prefix", type=Text,
         help="Specify a prefix to the container ID filename. "
         "Final file name will be followed by a timestamp. The default is no prefix.",
-        default="", dest="cidfile_prefix")
+        default=None, dest="cidfile_prefix")
 
     parser.add_argument("--tmpdir-prefix", type=Text,
                         help="Path prefix for temporary directories",

cwltool/context.py

@@ -122,7 +122,7 @@ def __init__(self, kwargs=None):
         self.on_error = "stop"          # type: Text
         self.strict_memory_limit = False  # type: bool
 
-        self.record_container_id = None
+        self.record_container_id = False
         self.cidfile_dir = None
         self.cidfile_prefix = None
 

cwltool/docker.py

@@ -338,9 +338,9 @@ def create_runtime(self, env, runtimeContext):
         runtime.append(u"--env=HOME=%s" % self.builder.outdir)
 
         # add parameters to docker to write a container ID file
-        if runtimeContext.record_container_id is not None:
+        if runtimeContext.record_container_id is True:
             cidfile_dir = runtimeContext.cidfile_dir
-            if cidfile_dir != "":
+            if cidfile_dir is not None:
                 if not os.path.isdir(cidfile_dir):
                     _logger.error("--cidfile-dir %s error:\n%s", cidfile_dir,
                                   cidfile_dir + " is not a directory or "
@@ -353,7 +353,7 @@ def create_runtime(self, env, runtimeContext):
             else:
                 cidfile_dir = os.getcwd()
             cidfile_name = datetime.datetime.now().strftime("%Y%m%d%H%M%S-%f") + ".cid"
-            if runtimeContext.cidfile_prefix != "":
+            if runtimeContext.cidfile_prefix is not None:
                 cidfile_name = str(runtimeContext.cidfile_prefix + "-" + cidfile_name)
             cidfile_path = os.path.join(cidfile_dir, cidfile_name)
             runtime.append(u"--cidfile=%s" % cidfile_path)

tests/test_examples.py

@@ -20,7 +20,8 @@
 from cwltool.resolver import Path
 from cwltool.process import CWL_IANA
 
-from .util import (get_data, get_main_output, get_windows_safe_factory, needs_docker,
+from .util import (get_data, get_main_output, get_windows_safe_factory,
+                   needs_docker, working_directory,
                    needs_singularity, temp_dir, windows_needs_docker)
 
 
@@ -712,6 +713,18 @@ def test_record_container_id():
         assert len(os.listdir(cid_dir)) == 2
 
 
+@needs_docker
+def test_do_not_record_container_id(tmpdir):
+    with temp_dir('cidr') as cid_dir:
+        with working_directory(cid_dir):
+            error_code, _, stderr = get_main_output(
+                ["--outdir", str(tmpdir),
+                 get_data("tests/wf/cache_test_workflow.cwl")])
+        assert "completed success" in stderr
+        assert error_code == 0
+        assert len(os.listdir(cid_dir)) == 0
+
+
 @needs_docker
 def test_wf_without_container():
     test_file = "hello-workflow.cwl"