add negative test for v1.0

Author: mr-c

cwltool/builder.py

@@ -195,7 +195,6 @@ def bind_input(self,
                    discover_secondaryFiles,  # type: bool
                    lead_pos=None,            # type: Optional[Union[int, List[int]]]
                    tail_pos=None,            # type: Optional[List[int]]
-                   cwl_version=None          # type: Optional[Text]
                   ):  # type: (...) -> List[MutableMapping[Text, Any]]
 
         if tail_pos is None:
@@ -213,7 +212,8 @@ def bind_input(self,
             bp = list(aslist(lead_pos))
             if "position" in binding:
                 position = binding["position"]
-                if isinstance(position, str) and cwl_version != "v1.0":
+                if isinstance(position, str):  # no need to test the CWL Version
+                                               # the schema for v1.0 only allow ints
                     binding['position'] = self.do_eval(position, context=datum)
                     bp.append(binding['position'])
                 else:

cwltool/process.py

@@ -703,13 +703,9 @@ def inc(d):  # type: (List[int]) -> None
                           tmpdir,
                           stagedir)
 
-        cwl_version = self.metadata.get(
-            "http://commonwl.org/cwltool#original_cwlVersion", None)
-
         bindings.extend(builder.bind_input(
             self.inputs_record_schema, job,
-            discover_secondaryFiles=getdefault(runtime_context.toplevel, False),
-            cwl_version=cwl_version))
+            discover_secondaryFiles=getdefault(runtime_context.toplevel, False)))
 
         if self.tool.get("baseCommand"):
             for index, command in enumerate(aslist(self.tool["baseCommand"])):
@@ -727,7 +723,9 @@ def inc(d):  # type: (List[int]) -> None
                     arg = copy.deepcopy(arg)
                     if arg.get("position"):
                         position = arg.get("position")
-                        if isinstance(position, str) and cwl_version != "v1.0":
+                        if isinstance(position, str):  # no need to test the
+                                                       # CWLVersion as the v1.0
+                                                       # schema only allows ints
                             position = builder.do_eval(position)
                             if position is None:
                                 position = 0

tests/echo-position-expr-job.yml

@@ -0,0 +1,2 @@
+one: 1
+two: 2

tests/echo-position-expr.cwl

@@ -0,0 +1,30 @@
+#!/usr/bin/env cwl-runner
+
+class: CommandLineTool
+cwlVersion: v1.0
+requirements:
+  InlineJavascriptRequirement: {}
+inputs:
+  one:
+    type: int
+    inputBinding:
+      position: $(self)
+  two:
+    type: int
+    inputBinding:
+      valueFrom: sensation!
+      position: ${return self+1;}
+arguments:
+  - position: ${return 2;}
+    valueFrom: singular
+  - position: ${return null;}
+    valueFrom: 🕺
+outputs:
+  out:
+    type: string
+    outputBinding:
+      glob: out.txt
+      loadContents: true
+      outputEval: $(self[0].contents)
+baseCommand: echo
+stdout: out.txt

tests/test_examples.py

@@ -887,3 +887,11 @@ def test_bad_basecommand_docker():
         ["--debug", "--default-container", "debian", get_data(test_file)])
     assert "permanentFail" in stderr, stderr
     assert error_code == 1
+
+def test_v1_0_position_expression():
+    test_file = "tests/echo-position-expr.cwl"
+    test_job = "tests/echo-position-expr-job.yml"
+    error_code, stdout, stderr = get_main_output(
+        [get_data(test_file), get_data(test_job)])
+    assert "is not int" in stderr, stderr
+    assert error_code == 1