From: Lucas Di Pentima Date: Wed, 26 Feb 2020 23:58:59 +0000 (-0300) Subject: 16169: Adds test exposing the requirement propagation bug. X-Git-Tag: 2.0.1~4 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/b6ad6faad9a0750538cdd6ed68862d6c7d772b2d 16169: Adds test exposing the requirement propagation bug. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- diff --git a/sdk/cwl/tests/16169-no-listing-hint.cwl b/sdk/cwl/tests/16169-no-listing-hint.cwl new file mode 100644 index 0000000000..fe4f991ff4 --- /dev/null +++ b/sdk/cwl/tests/16169-no-listing-hint.cwl @@ -0,0 +1,24 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + +cwlVersion: v1.0 +class: Workflow +$namespaces: + arv: "http://arvados.org/cwl#" + cwltool: "http://commonwl.org/cwltool#" +requirements: + cwltool:LoadListingRequirement: + loadListing: no_listing +inputs: + d: Directory +steps: + step1: + in: + d: d + out: [out] + run: wf/16169-step.cwl +outputs: + out: + type: File + outputSource: step1/out diff --git a/sdk/cwl/tests/arvados-tests.yml b/sdk/cwl/tests/arvados-tests.yml index 99aee37956..df9fac8426 100644 --- a/sdk/cwl/tests/arvados-tests.yml +++ b/sdk/cwl/tests/arvados-tests.yml @@ -310,3 +310,15 @@ should_fail: true tool: 15295-bad-keep-ref.cwl doc: Test checking for invalid keepref + +- job: listing-job.yml + output: { + "out": { + "class": "File", + "location": "output.txt", + "size": 5, + "checksum": "sha1$724ba28f4a9a1b472057ff99511ed393a45552e1" + } + } + tool: 16169-no-listing-hint.cwl + doc: "Test cwltool:LoadListingRequirement propagation" diff --git a/sdk/cwl/tests/wf/16169-step.cwl b/sdk/cwl/tests/wf/16169-step.cwl new file mode 100644 index 0000000000..8386df517b --- /dev/null +++ b/sdk/cwl/tests/wf/16169-step.cwl @@ -0,0 +1,15 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + +class: CommandLineTool +cwlVersion: v1.0 +requirements: + InlineJavascriptRequirement: {} +inputs: + d: Directory +outputs: + out: stdout +stdout: output.txt +arguments: + [echo, "${if(inputs.d.listing === undefined) {return 'true';} else {return 'false';}}"] \ No newline at end of file