X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/39189b90bd2f73d4f4938049ffa4441a967ca24c..aea835bc965d42e225c2641b0210c4b521f6dc4e:/sdk/cwl/tests/wf/scatter2_subwf.cwl

diff --git a/sdk/cwl/tests/wf/scatter2_subwf.cwl b/sdk/cwl/tests/wf/scatter2_subwf.cwl
index daf18b11ca..df4d992c35 100644
--- a/sdk/cwl/tests/wf/scatter2_subwf.cwl
+++ b/sdk/cwl/tests/wf/scatter2_subwf.cwl
@@ -1,41 +1,77 @@
-cwlVersion: v1.0
-$graph:
-- class: Workflow
-  id: '#main'
-  inputs:
-  - type: int
-    id: '#main/sleeptime'
-  outputs:
-  - type: string
-    outputSource: '#main/sleep1/out'
-    id: '#main/out'
-  steps:
-  - in:
-    - valueFrom: |
-        ${
-          return String(inputs.sleeptime) + "b";
+{
+  "$graph": [
+    {
+      "class": "Workflow",
+      "hints": [],
+      "id": "#main",
+      "inputs": [
+        {
+          "id": "#main/sleeptime",
+          "type": "int"
         }
-      id: '#main/sleep1/blurb'
-    - source: '#main/sleeptime'
-      id: '#main/sleep1/sleeptime'
-    out: ['#main/sleep1/out']
-    run:
-      class: CommandLineTool
-      inputs:
-      - type: int
-        inputBinding: {position: 1}
-        id: '#main/sleep1/sleeptime'
-      outputs:
-      - type: string
-        outputBinding:
-          outputEval: out
-        id: '#main/sleep1/out'
-      baseCommand: sleep
-    id: '#main/sleep1'
-  requirements:
-  - {class: InlineJavascriptRequirement}
-  - {class: ScatterFeatureRequirement}
-  - {class: StepInputExpressionRequirement}
-  - {class: SubworkflowFeatureRequirement}
-  hints:
-  - class: http://arvados.org/cwl#RunInSingleContainer
\ No newline at end of file
+      ],
+      "outputs": [
+        {
+          "id": "#main/out",
+          "outputSource": "#main/sleep1/out",
+          "type": "string"
+        }
+      ],
+      "requirements": [
+        {
+          "class": "InlineJavascriptRequirement"
+        },
+        {
+          "class": "ScatterFeatureRequirement"
+        },
+        {
+          "class": "StepInputExpressionRequirement"
+        },
+        {
+          "class": "SubworkflowFeatureRequirement"
+        }
+      ],
+      "steps": [
+        {
+          "id": "#main/sleep1",
+          "in": [
+            {
+              "id": "#main/sleep1/blurb",
+              "valueFrom": "${\n  return String(inputs.sleeptime) + \"b\";\n}\n"
+            },
+            {
+              "id": "#main/sleep1/sleeptime",
+              "source": "#main/sleeptime"
+            }
+          ],
+          "out": [
+            "#main/sleep1/out"
+          ],
+          "run": {
+            "baseCommand": "sleep",
+            "class": "CommandLineTool",
+            "inputs": [
+              {
+                "id": "#main/sleep1/sleeptime",
+                "inputBinding": {
+                  "position": 1
+                },
+                "type": "int"
+              }
+            ],
+            "outputs": [
+              {
+                "id": "#main/sleep1/out",
+                "outputBinding": {
+                  "outputEval": "out"
+                },
+                "type": "string"
+              }
+            ]
+          }
+        }
+      ]
+    }
+  ],
+  "cwlVersion": "v1.0"
+}
\ No newline at end of file