10813: Merge branch 'master' into 10813-arv-put-six-threads

[arvados.git] / sdk / cwl / tests / wf / expect_packed.cwl

diff --git a/sdk/cwl/tests/wf/expect_packed.cwl b/sdk/cwl/tests/wf/expect_packed.cwl
index 3545f34abb71f6e48fe75d0fbc28a16077e88e02..d7b9d61a749d51db0aca57581ad1c51feca1969d 100644 (file)
--- a/sdk/cwl/tests/wf/expect_packed.cwl
+++ b/sdk/cwl/tests/wf/expect_packed.cwl
@@ -1,21 +1,34 @@
+cwlVersion: v1.0
 $graph:
-- baseCommand: cat
-  class: CommandLineTool
-  id: '#submit_tool.cwl'
+- class: CommandLineTool
+  requirements:
+  - class: DockerRequirement
+    dockerPull: debian:8
   inputs:
-  - default: {class: File, location: 'keep:99999999999999999999999999999991+99/tool/blub.txt'}
-    id: '#submit_tool.cwl/x'
-    inputBinding: {position: 1}
+  - id: '#submit_tool.cwl/x'
     type: File
+    default:
+      class: File
+      location: keep:99999999999999999999999999999991+99/blub.txt
+    inputBinding:
+      position: 1
   outputs: []
-  requirements:
-  - {class: DockerRequirement, dockerImageId: 'debian:8', dockerPull: 'debian:8'}
+  baseCommand: cat
+  id: '#submit_tool.cwl'
 - class: Workflow
-  id: '#main'
   inputs:
-  - default: {basename: blorp.txt, class: File, location: 'keep:99999999999999999999999999999991+99/input/blorp.txt'}
-    id: '#main/x'
+  - id: '#main/x'
     type: File
+    default: {class: File, location: 'keep:99999999999999999999999999999992+99/blorp.txt',
+      basename: blorp.txt}
+  - id: '#main/y'
+    type: Directory
+    default: {class: Directory, location: 'keep:99999999999999999999999999999998+99',
+      basename: 99999999999999999999999999999998+99}
+  - id: '#main/z'
+    type: Directory
+    default: {class: Directory, basename: anonymous, listing: [{basename: renamed.txt,
+          class: File, location: 'keep:99999999999999999999999999999998+99/file1.txt'}]}
   outputs: []
   steps:
   - id: '#main/step1'
@@ -23,4 +36,4 @@ $graph:
     - {id: '#main/step1/x', source: '#main/x'}
     out: []
     run: '#submit_tool.cwl'
-cwlVersion: v1.0
+  id: '#main'