Skip to content

Commit 26f8861

Browse files
GlassOfWhiskeymr-ctetron
authored
Added loop support (#5)
* conformance tests: report the names of the failures --------- Co-authored-by: Michael R. Crusoe <[email protected]> Co-authored-by: Peter Amstutz <[email protected]>
1 parent 8512c8b commit 26f8861

27 files changed

+977
-76
lines changed

.github/config/wordlist.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
abstractworkflowstep
12
acyclic
23
amstutz
34
arrayschema
@@ -160,6 +161,9 @@ loadlistingrequirement
160161
localhost
161162
lookahead
162163
loopback
164+
loopinput
165+
loopoutputmethod
166+
loopworkflowstep
163167
maccallum
164168
macos
165169
mappredicate
@@ -194,6 +198,7 @@ outputbinding
194198
outputenumschema
195199
outputeval
196200
outputformat
201+
outputmethod
197202
outputschema
198203
outputsink
199204
outputsource
@@ -231,6 +236,7 @@ saladversion
231236
sbgenomics
232237
scatterfeaturerequirement
233238
scattermethod
239+
scatterworkflowstep
234240
schemadefrequirement
235241
schemaorg
236242
schemas

.github/workflows/cwltool.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
python-version: '3.9.x'
2525

2626
- name: Setup prerequirements
27-
run: pip install "cwltest>=2.3" pytest-xdist "git+https://github.com/common-workflow-language/cwltool.git@main#egg=cwltool"
27+
run: pip install "cwltest>=2.3" pytest-xdist "cwltool>=3.1.20240909164951"
2828

2929
- name: Copy in cwltool-specific configuration for the cwltest pytest plugin
3030
run: cp "$(python -c 'from cwltool.tests.util import get_data; print(get_data("tests/cwl-conformance/cwltool-conftest.py"))')" conftest.py
@@ -33,4 +33,4 @@ jobs:
3333
run: cp conformance_tests.yaml conformance_tests.cwltest.yaml
3434

3535
- name: Run tests against the reference runner
36-
run: python -m pytest conformance_tests.cwltest.yaml -n auto -rs
36+
run: python -m pytest conformance_tests.cwltest.yaml -n auto -rsfE

CONFORMANCE_TESTS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ We will use this single entry to explain the format
144144
Must include one or more of the following tags: `command_line_tool`, `expression_tool` or `workflow`.
145145
If the test does not test any optional features, the tag `required` is required.
146146

147-
Because `conformance_tests.yaml` is a `schema-salad` processed document, [`$import`](https://www.commonwl.org/v1.2/SchemaSalad.html#Import)
147+
Because `conformance_tests.yaml` is a `schema-salad` processed document, [`$import`](https://www.commonwl.org/v1.3/SchemaSalad.html#Import)
148148
can be used to organize the tests into separate files.
149149

150150
Currently, the main file is too big (over 3400 lines); we are slowly re-organizing it.
@@ -166,7 +166,7 @@ At any level, if there is an extra field, then that will be considered an error.
166166
An exception to this is `class: File` and `class: Directory` objects, the `cwl-runner` under test can add additional fields here without causing a test to fail.
167167
Likewise, if you don't want to test some aspect of a `class: File` or `class: Directory` object (like `nameext`) you can just omit it.
168168

169-
[According to the CWL standards](https://www.commonwl.org/v1.2/CommandLineTool.html#File), the format of the `location` field in
169+
[According to the CWL standards](https://www.commonwl.org/v1.3/CommandLineTool.html#File), the format of the `location` field in
170170
`class: File` and `class: Directory` is implementation specific and we should not be testing them.
171171
Please remember to use `location: Any` for them.
172172

0 commit comments

Comments
 (0)