Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP fix #1330 #1566

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions cwltool/schemas/v1.1/conformance_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2598,6 +2598,17 @@
doc: Test an anonymous enum inside an array inside a record, SchemaDefRequirement
tags: [command_line_tool, schema_def]


- job: tests/empty.json
tool: tests/fail-unconnected-expressiontool.cwl
label: wf_step_access_undeclared_param_expressiontool
id: 198
doc: >-
Test that parameters that don't appear in the `run` process
inputs are not present in the input object used to run the expressiontool.
should_fail: true
tags: [ required, workflow ]

Comment on lines +2601 to +2611
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The CI doesn't run this copy of the tests, it makes a new checkout from GitHub

wget "https://github.com/common-workflow-language/${repo}/archive/${spec_branch}.tar.gz"

Copy link
Contributor Author

@manabuishii manabuishii Apr 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mr-c Thanks

I will create a PullRequest about this test case (tests/fail-unconnected-expressiontool.cwl),

Repo:
https://github.com/common-workflow-language/cwl-v1.2
Branch:
1.2.1_proposed

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, you can also keep it in this PR, just move the test scripts to the the test directory and add an entry to test_examples.py

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you move this file to the tests directory, or a sub-directory?

# New tests for v1.1

- job: tests/wc-job.json
Expand Down
20 changes: 20 additions & 0 deletions tests/fail-unconnected-expressiontool.cwl
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
class: Workflow
cwlVersion: v1.1
inputs:
inp1:
type: string
default: hello inp1
inp2:
type: string
default: hello inp2
outputs:
out:
type: string
outputSource: step1/out
steps:
step1:
in:
in: inp1
in2: inp2
out: [out]
run: fail-unspecified-input-expressiontool.cwl
18 changes: 18 additions & 0 deletions tests/fail-unspecified-input-expressiontool.cwl
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
cwlVersion: v1.0
class: ExpressionTool

requirements:
InlineJavascriptRequirement: {}

inputs:
in:
type: string

outputs:
out:
type: string

expression: |
${
return {"out": inputs.in +" "+inputs.in2};
}