Merge pull request #941 from psafont/empty-input

Test against errors on empty input from stdin

Author: mr-c

tests/test_empty_input.py

@@ -0,0 +1,20 @@
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from io import StringIO
+
+from cwltool.main import main
+from .util import get_data, temp_dir, windows_needs_docker
+
+@windows_needs_docker
+def test_empty_input():
+    empty_json = '{}'
+    empty_input = StringIO(empty_json)
+
+    with temp_dir() as tmpdir:
+        params = ['--outdir', tmpdir, get_data('tests/wf/no-parameters-echo.cwl'), '-']
+
+        try:
+            assert main(params, stdin=empty_input) == 0
+        except SystemExit as err:
+            assert err.code == 0

tests/test_toolargparse.py

@@ -70,6 +70,10 @@
      ),
     ('boolean', script_b, lambda x: [x, '--help']
      ),
+    ('help with c', script_c, lambda x: [x, '--help']),
+    ('foo with c', script_c,
+     lambda x: [x, '--foo.one', get_data('tests/echo.cwl'), '--foo.two', 'test']
+     )
 ]
 
 @needs_docker
@@ -78,34 +82,12 @@ def test_argparse(name, script_contents, params):
     try:
         script = NamedTemporaryFile(mode='w', delete=False)
         script.write(script_contents)
-        script.flush()
         script.close()
 
-        try:
-            assert main(params(script.name)) == 0, name
-        except SystemExit as err:
-            assert err.code == 0, name
-    finally:
-        if os.path.exists(script.name):
-            os.remove(script.name)
-
-script_c_params = [
-    (lambda x: [x, '--help']),
-    (lambda x: [x, '--foo.one', get_data('tests/echo.cwl'), '--foo.two', 'test'])
-]
-
-@pytest.mark.parametrize('params', script_c_params)
-def test_argparse_record(params):
-    try:
-        script = NamedTemporaryFile(mode='w', delete=False)
-        script.write(script_c)
-        script.flush()
-        script.close()
+        assert main(params(script.name)) == 0, name
 
-        try:
-            assert main(params(script.name)) == 0
-        except SystemExit as err:
-            assert err.code == 0
+    except SystemExit as err:
+        assert err.code == 0, name
     finally:
         if os.path.exists(script.name):
-            os.remove(script.name)
+            os.unlink(script.name)

tests/util.py

@@ -7,6 +7,7 @@
 import shutil
 import contextlib
 import tempfile
+import shutil
 from typing import Text
 
 from pkg_resources import (Requirement, ResolutionError,  # type: ignore

tests/wf/no-parameters-echo.cwl

@@ -0,0 +1,12 @@
+#!/usr/bin/env cwl-runner
+cwlVersion: v1.0
+class: CommandLineTool
+doc: "This is a tool that can be launched without parameters"
+baseCommand: [echo]
+inputs:
+  in:
+    type: string
+    default: "foo"
+outputs:
+  e_out:
+    type: stdout