Update timelimit tests with workflow and expression tool tests

bogdang989 · bogdang989 · commit fe37ffb11061 · 2019-02-26T18:10:13.000+01:00
diff --git a/conformance_tests.yaml b/conformance_tests.yaml
@@ -2810,18 +2810,27 @@
   doc: Test expression in time limit
   tags: [ command_line_tool, timelimit, inline_javascript ]
 
+- job: tests/empty.json
+  output:
+    status: Done
+  tool: tests/timelimit5.cwl
+  label: timelimit_expressiontool
+  doc: Test timelimit in expressiontool is ignored
+  tags: [ expression_tool, timelimit, inline_javascript ]
+
 - job: tests/empty.json
   should_fail: true
   tool: tests/timelimit-wf.cwl
   label: timelimit_basic_wf
-  doc: Test that workflow fails when exceeding time limit
+  doc: Test that tool in workflow fails when exceeding time limit
   tags: [ workflow, timelimit ]
 
 - job: tests/empty.json
-  should_fail: true
+  output:
+    o: time passed
   tool: tests/timelimit2-wf.cwl
   label: timelimit_invalid_wf
-  doc: Test invalid time limit value workflow level
+  doc: Test workflow level time limit propagation
   tags: [ workflow, timelimit ]
 
 - job: tests/empty.json
@@ -2834,7 +2843,7 @@
 
 - job: tests/empty.json
   should_fail: true
-  tool: tests/timelimit4.cwl
+  tool: tests/timelimit4-wf.cwl
   label: timelimit_from_expression_wf
   doc: Test expression in time limit in workflow
   tags: [ workflow, timelimit, inline_javascript ]
diff --git a/tests/timelimit-wf.cwl b/tests/timelimit-wf.cwl
@@ -3,7 +3,7 @@ class: Workflow
 cwlVersion: v1.1.0-dev1
 
 requirements:
-  TimeLimit:
+  ToolTimeLimit:
     timelimit: 3
 
 inputs:
diff --git a/tests/timelimit.cwl b/tests/timelimit.cwl
@@ -3,6 +3,6 @@ cwlVersion: v1.1.0-dev1
 inputs: []
 outputs: []
 requirements:
-  TimeLimit:
+  ToolTimeLimit:
     timelimit: 3
 baseCommand: [sleep, "15"]
diff --git a/tests/timelimit2-wf.cwl b/tests/timelimit2-wf.cwl
@@ -3,17 +3,17 @@ class: Workflow
 cwlVersion: v1.1.0-dev1
 
 requirements:
-  TimeLimit:
-    timelimit: -1
+  ToolTimeLimit:
+    timelimit: 5
 
 inputs:
   i:
-    type: int?
+    type: string?
 
 outputs:
   o:
     type: string?
-    outputSource: step1/o
+    outputSource: step2/o
 
 steps:
   step1:
@@ -22,13 +22,28 @@ steps:
     out: [o]
     run:
       class: CommandLineTool
-      baseCommand: ["sleep", "10"]
+      baseCommand: ["sleep", "3"]
+      inputs:
+        i:
+          type: string?
+      outputs:
+        o:
+          type: string?
+          outputBinding:
+            outputEval: "time passed"
+  step2:
+    in:
+      i: step1/o
+    out: [o]
+    run:
+      class: CommandLineTool
+      baseCommand: ["sleep", "3"]
       inputs:
         i:
-          type: int?
+          type: string?
       outputs:
         o:
           type: string?
           outputBinding:
             outputEval: "time passed"
-      
+      
diff --git a/tests/timelimit2.cwl b/tests/timelimit2.cwl
@@ -3,6 +3,6 @@ cwlVersion: v1.1.0-dev1
 inputs: []
 outputs: []
 requirements:
-  TimeLimit:
+  ToolTimeLimit:
     timelimit: -1
 baseCommand: [sleep, "15"]
diff --git a/tests/timelimit3-wf.cwl b/tests/timelimit3-wf.cwl
@@ -3,7 +3,7 @@ class: Workflow
 cwlVersion: v1.1.0-dev1
 
 requirements:
-  TimeLimit:
+  ToolTimeLimit:
     timelimit: 0
 
 inputs:
diff --git a/tests/timelimit3.cwl b/tests/timelimit3.cwl
@@ -3,6 +3,6 @@ cwlVersion: v1.1.0-dev1
 inputs: []
 outputs: []
 requirements:
-  TimeLimit:
+  ToolTimeLimit:
     timelimit: 0
 baseCommand: [sleep, "15"]
diff --git a/tests/timelimit4-wf.cwl b/tests/timelimit4-wf.cwl
@@ -3,7 +3,7 @@ class: Workflow
 cwlVersion: v1.1.0-dev1
 
 requirements:
-  TimeLimit:
+  ToolTimeLimit:
     timelimit: $(1+2)
   InlineJavascriptRequirement: {}
 
diff --git a/tests/timelimit4.cwl b/tests/timelimit4.cwl
@@ -4,6 +4,6 @@ inputs: []
 outputs: []
 requirements:
   InlineJavascriptRequirement: {}
-  TimeLimit:
+  ToolTimeLimit:
     timelimit: $(1+2)
 baseCommand: [sleep, "15"]
diff --git a/tests/timelimit5.cwl b/tests/timelimit5.cwl
@@ -0,0 +1,10 @@
+class: ExpressionTool
+cwlVersion: v1.1.0-dev1
+inputs: []
+outputs:
+  status: string
+requirements:
+  ToolTimeLimit:
+    timelimit: 3
+  InlineJavascriptRequirement: {}
+expression: "${\n    function sleep(milliseconds) {\n      var start = new Date().getTime();\n      for (var i = 0; i < 1e7; i++) {\n        if ((new Date().getTime() - start) > milliseconds){\n          break;\n        }\n      }\n    };\n    sleep(5000);\n    return {\"status\": \"Done\"}\n}"
