[ARVADOS] created: 1.3.0-2799-gba3ecdde4

Git user git at public.arvados.org
Fri Jul 17 13:51:31 UTC 2020


        at  ba3ecdde459484e106b5ccb30fde4ce90d8b5c3e (commit)


commit ba3ecdde459484e106b5ccb30fde4ce90d8b5c3e
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Fri Jul 17 10:50:03 2020 -0300

    16377: Just checking the test really fails without the fix
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/sdk/cwl/tests/13976-keepref-wf.cwl b/sdk/cwl/tests/13976-keepref-wf.cwl
index 7aa7b0aa4..8d0dee971 100644
--- a/sdk/cwl/tests/13976-keepref-wf.cwl
+++ b/sdk/cwl/tests/13976-keepref-wf.cwl
@@ -1,11 +1,18 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 cwlVersion: v1.0
 class: CommandLineTool
 requirements:
   - class: InlineJavascriptRequirement
+  - class: ShellCommandRequirement
 arguments:
+  - cd
+  - $(inputs.hello.dirname)
+  - {shellQuote: false, valueFrom: "&&"}
   - ls
-  - -l
-  - $(inputs.hello)
+stdout: hello.out
 inputs:
   hello:
     type: File
@@ -14,4 +21,8 @@ inputs:
       location: keep:4d8a70b1e63b2aad6984e40e338e2373+69/hello.txt
     secondaryFiles:
       - .idx
-outputs: []
\ No newline at end of file
+outputs:
+  out:
+    type: File
+    outputBinding:
+      glob: hello.out
diff --git a/sdk/cwl/tests/arvados-tests.yml b/sdk/cwl/tests/arvados-tests.yml
index c4c096875..a46decd96 100644
--- a/sdk/cwl/tests/arvados-tests.yml
+++ b/sdk/cwl/tests/arvados-tests.yml
@@ -120,7 +120,12 @@
 
 - job: null
   output:
-    out: null
+    "out": {
+        "location": "hello.out",
+        "class": "File",
+        "checksum": "sha1$ec5d3976351abab45a483a49ce714a8430cb203a",
+        "size": 24
+    }
   tool: 13976-keepref-wf.cwl
   doc: "Test issue 13976"
 
@@ -329,3 +334,14 @@
   }
   tool: 16169-no-listing-hint.cwl
   doc: "Test cwltool:LoadListingRequirement propagation"
+
+- job: hello.yml
+  output:
+    "out": {
+        "location": "hello.out",
+        "class": "File",
+        "checksum": "sha1$ec5d3976351abab45a483a49ce714a8430cb203a",
+        "size": 24
+    }
+  tool: 16377-missing-default.cwl
+  doc: "Test issue 16377 - missing default fails even when it should be overridden by valid input"

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list