17462: Add integration test to confirm fix

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/.licenseignore b/.licenseignore
index 7ebc82667ce80565575029ff2df12fa44703297e..e3289aa7c79e5cb6dd825a3cecaadca977481987 100644 (file)
--- a/.licenseignore
+++ b/.licenseignore
@@ -86,3 +86,5 @@ sdk/python/tests/fed-migrate/CWLFile
 sdk/python/tests/fed-migrate/*.cwl
 sdk/python/tests/fed-migrate/*.cwlex
 doc/install/*.xlsx
 sdk/python/tests/fed-migrate/*.cwl
 sdk/python/tests/fed-migrate/*.cwlex
 doc/install/*.xlsx

+sdk/cwl/tests/wf/hello.txt
+sdk/cwl/tests/wf/indir1/hello2.txt
\ No newline at end of file

diff --git a/sdk/cwl/tests/arvados-tests.yml b/sdk/cwl/tests/arvados-tests.yml
index 668604f88470e18ea566d807301b712bfafa935e..48255f85756a67ed7fa6026940695c8652bdb41c 100644 (file)
--- a/sdk/cwl/tests/arvados-tests.yml
+++ b/sdk/cwl/tests/arvados-tests.yml
@@ -355,3 +355,8 @@
       "size": 4
   tool: 17267-broken-schemas.cwl
   doc: "Test issue 17267 - inaccessible $schemas URL is not a fatal error"
       "size": 4
   tool: 17267-broken-schemas.cwl
   doc: "Test issue 17267 - inaccessible $schemas URL is not a fatal error"

+
+- job: null
+  output: {}
+  tool: wf/trick_defaults2.cwl
+  doc: "Test issue 17462 - secondary file objects on file defaults are not resolved"

diff --git a/sdk/cwl/tests/wf/hello.txt b/sdk/cwl/tests/wf/hello.txt
new file mode 100644 (file)
index 0000000..ce01362
--- /dev/null
+++ b/sdk/cwl/tests/wf/hello.txt
@@ -0,0 +1 @@
+hello

diff --git a/sdk/cwl/tests/wf/indir1/hello2.txt b/sdk/cwl/tests/wf/indir1/hello2.txt
new file mode 100644 (file)
index 0000000..14be0d4
--- /dev/null
+++ b/sdk/cwl/tests/wf/indir1/hello2.txt
@@ -0,0 +1 @@
+hello2

diff --git a/sdk/cwl/tests/wf/trick_defaults2.cwl b/sdk/cwl/tests/wf/trick_defaults2.cwl
new file mode 100644 (file)
index 0000000..9f42922
--- /dev/null
+++ b/sdk/cwl/tests/wf/trick_defaults2.cwl
@@ -0,0 +1,18 @@
+#!/usr/bin/env cwl-runner
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+class: CommandLineTool
+cwlVersion: v1.0
+inputs:
+  inp1:
+    type: File
+    default:
+      class: File
+      location: hello.txt
+      secondaryFiles:
+        - class: Directory
+          location: indir1
+outputs: []
+baseCommand: 'true'