From: Peter Amstutz <peter.amstutz@curii.com>
Date: Thu, 15 Apr 2021 14:18:07 +0000 (-0400)
Subject: 17462: Add integration test to confirm fix
X-Git-Tag: 2.2.0~71^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/cfdd62d07f704a4c982a15189071096388982b9a

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 7ebc82667c..e3289aa7c7 100644
--- 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/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 668604f884..48255f8575 100644
--- 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"
+
+- 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
index 0000000000..ce01362503
--- /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
index 0000000000..14be0d41c6
--- /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
index 0000000000..9f42922188
--- /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'