Skip to content

Commit c22f6f3

Browse files
committed
Add tags to aid in checks of cwl-inputs-schema-gen
1 parent e62f99d commit c22f6f3

File tree

5 files changed

+33
-33
lines changed

5 files changed

+33
-33
lines changed

conformance_tests.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,7 +1316,7 @@
13161316
tool: tests/docker-array-secondaryfiles.cwl
13171317
id: filesarray_secondaryfiles2
13181318
doc: Test required, optional and null secondaryFiles on array of files.
1319-
tags: [ docker, inline_javascript, shell_command, command_line_tool ]
1319+
tags: [ docker, inline_javascript, shell_command, command_line_tool, inputs_should_parse ]
13201320

13211321
- job: tests/dir7.yml
13221322
output: {
@@ -1779,7 +1779,7 @@
17791779
Test that parameters that don't appear in the `run` process
17801780
inputs are not present in the input object used to run the tool.
17811781
should_fail: true
1782-
tags: [ required, workflow ]
1782+
tags: [ required, workflow, inputs_should_parse ]
17831783

17841784
- job: tests/empty.json
17851785
output:
@@ -2531,7 +2531,7 @@
25312531
tool: tests/record-in-secondaryFiles-missing-wf.cwl
25322532
id: secondary_files_missing
25332533
doc: Test checking when secondaryFiles are missing
2534-
tags: [ workflow, required ]
2534+
tags: [ workflow, required, inputs_should_parse ]
25352535

25362536
- job: tests/record-format-job.yml
25372537
output: {}
@@ -2545,21 +2545,21 @@
25452545
tool: tests/record-in-format.cwl
25462546
id: input_records_file_entry_with_format_and_bad_regular_input_file_format
25472547
doc: Test file format checking on parameter
2548-
tags: [ command_line_tool, format_checking ]
2548+
tags: [ command_line_tool, format_checking, inputs_should_parse ]
25492549

25502550
- job: tests/record-format-job3.yml
25512551
should_fail: true
25522552
tool: tests/record-in-format.cwl
25532553
doc: Test file format checking on record field
25542554
id: input_records_file_entry_with_format_and_bad_entry_file_format
2555-
tags: [ command_line_tool, format_checking ]
2555+
tags: [ command_line_tool, format_checking, inputs_should_parse ]
25562556

25572557
- job: tests/record-format-job4.yml
25582558
should_fail: true
25592559
tool: tests/record-in-format.cwl
25602560
doc: Test file format checking on array item
25612561
id: input_records_file_entry_with_format_and_bad_entry_array_file_format
2562-
tags: [ command_line_tool, format_checking ]
2562+
tags: [ command_line_tool, format_checking, inputs_should_parse ]
25632563

25642564
- job: tests/record-secondaryFiles-job.yml
25652565
output: {
@@ -2626,14 +2626,14 @@
26262626
tool: tests/timelimit.cwl
26272627
id: timelimit_basic
26282628
doc: Test that job fails when exceeding time limit
2629-
tags: [ command_line_tool, timelimit, work_reuse ]
2629+
tags: [ command_line_tool, timelimit, work_reuse, inputs_should_parse ]
26302630

26312631
- job: tests/empty.json
26322632
should_fail: true
26332633
tool: tests/timelimit2.cwl
26342634
id: timelimit_invalid
26352635
doc: Test invalid time limit value
2636-
tags: [ command_line_tool, timelimit, json_schema_invalid ]
2636+
tags: [ command_line_tool, timelimit, json_schema_invalid, inputs_should_parse ]
26372637

26382638
- job: tests/empty.json
26392639
output: {}
@@ -2647,7 +2647,7 @@
26472647
tool: tests/timelimit4.cwl
26482648
id: timelimit_from_expression
26492649
doc: Test expression in time limit
2650-
tags: [ command_line_tool, timelimit, inline_javascript, work_reuse ]
2650+
tags: [ command_line_tool, timelimit, inline_javascript, work_reuse, inputs_should_parse ]
26512651

26522652
- job: tests/empty.json
26532653
output:
@@ -2662,7 +2662,7 @@
26622662
tool: tests/timelimit-wf.cwl
26632663
id: timelimit_basic_wf
26642664
doc: Test that tool in workflow fails when exceeding time limit
2665-
tags: [ workflow, timelimit ]
2665+
tags: [ workflow, timelimit, inputs_should_parse ]
26662666

26672667
- job: tests/empty.json
26682668
output:
@@ -2685,7 +2685,7 @@
26852685
tool: tests/timelimit4-wf.cwl
26862686
id: timelimit_from_expression_wf
26872687
doc: Test expression in time limit in workflow
2688-
tags: [ workflow, timelimit, inline_javascript, work_reuse ]
2688+
tags: [ workflow, timelimit, inline_javascript, work_reuse, inputs_should_parse ]
26892689

26902690
- job: tests/empty.json
26912691
output: {}
@@ -2699,7 +2699,7 @@
26992699
tool: tests/networkaccess2.cwl
27002700
id: networkaccess_disabled
27012701
doc: Test networkaccess is disabled by default
2702-
tags: [ networkaccess, command_line_tool ]
2702+
tags: [ networkaccess, command_line_tool, inputs_should_parse ]
27032703

27042704
- job: tests/stage-array-job.json
27052705
tool: tests/stage-array.cwl
@@ -2796,7 +2796,7 @@
27962796
tool: tests/glob-path-error.cwl
27972797
id: glob_outside_outputs_fails
27982798
doc: Test fail trying to glob outside output directory
2799-
tags: [ command_line_tool, docker ]
2799+
tags: [ command_line_tool, docker, inputs_should_parse ]
28002800

28012801
- job: tests/empty.json
28022802
tool: tests/symlink-illegal.cwl
@@ -2808,7 +2808,7 @@
28082808
"baesname": "symlink.txt"
28092809
"checksum": "sha1$cd28ec34f3f9425aca544b6332453708e8aaa82a"
28102810
should_fail: true
2811-
tags: [ command_line_tool ]
2811+
tags: [ command_line_tool, inputs_should_parse ]
28122812
id: illegal_symlink
28132813

28142814
- job: tests/empty.json
@@ -3164,13 +3164,13 @@
31643164
id: params_broken_null
31653165
doc: Test parameter reference that refers to null.something
31663166
should_fail: true
3167-
tags: [ required, command_line_tool ]
3167+
tags: [ required, command_line_tool, inputs_should_parse ]
31683168

31693169
- job: tests/empty.json
31703170
tool: tests/params_broken_length_of_non_list.cwl
31713171
doc: Test parameter reference that refers to length of non-array input
31723172
should_fail: true
3173-
tags: [ required, command_line_tool ]
3173+
tags: [ required, command_line_tool, inputs_should_parse ]
31743174
id: length_for_non_array
31753175

31763176
- job: tests/length_non_array_input.yml
@@ -3398,14 +3398,14 @@
33983398
job: tests/dir-job.yml
33993399
doc: Test that a type error is raised if directories are returned by glob evaluation when type is File
34003400
should_fail: true
3401-
tags: [ required, command_line_tool ]
3401+
tags: [ required, command_line_tool, inputs_should_parse ]
34023402

34033403
- id: capture_dirs
34043404
tool: tests/capture-dirs.cwl
34053405
job: tests/dir-job.yml
34063406
doc: Test that a type error is raised if files are returned by glob evaluation when type is Directory
34073407
should_fail: true
3408-
tags: [ required, command_line_tool ]
3408+
tags: [ required, command_line_tool, inputs_should_parse ]
34093409

34103410
- id: capture_files_and_dirs
34113411
tool: tests/capture-files-and-dirs.cwl

tests/conditionals/test-index.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
tool: cond-wf-003.1.cwl
5757
job: val.1.job.yaml
5858
should_fail: True
59-
tags: [ conditional, inline_javascript, multiple_input, workflow ]
59+
tags: [ conditional, inline_javascript, multiple_input, workflow, inputs_should_parse ]
6060

6161
- id: first_non_null_second_non_null
6262
doc: "pickValue: first_non_null second item is non null"
@@ -79,14 +79,14 @@
7979
tool: cond-wf-004.cwl
8080
job: val.3.job.yaml
8181
should_fail: True
82-
tags: [ conditional, inline_javascript, multiple_input, workflow ]
82+
tags: [ conditional, inline_javascript, multiple_input, workflow, inputs_should_parse ]
8383

8484
- id: all_non_null_multi_with_non_array_output
8585
doc: "pickValue: all_non_null will fail validation"
8686
tool: cond-wf-005.cwl
8787
job: val.3.job.yaml
8888
should_fail: True
89-
tags: [ conditional, inline_javascript, multiple_input, workflow ]
89+
tags: [ conditional, inline_javascript, multiple_input, workflow, inputs_should_parse ]
9090

9191
- id: the_only_non_null_single_true
9292
doc: "pickValue: the_only_non_null will pass for only one active node"
@@ -101,7 +101,7 @@
101101
tool: cond-wf-006.cwl
102102
job: val.3.job.yaml
103103
should_fail: True
104-
tags: [ conditional, inline_javascript, multiple_input, workflow ]
104+
tags: [ conditional, inline_javascript, multiple_input, workflow, inputs_should_parse ]
105105

106106
- id: all_non_null_all_null
107107
doc: "pickValue: all_non_null will produce a list, even if empty"
@@ -176,7 +176,7 @@
176176
tool: cond-wf-012.cwl
177177
job: val.1.job.yaml
178178
should_fail: True
179-
tags: [ conditional, inline_javascript, workflow ]
179+
tags: [ conditional, inline_javascript, workflow, inputs_should_parse ]
180180

181181
- id: conditionals_multi_scatter
182182
doc: "Scatter two steps, flatten result + pickValue"
@@ -241,7 +241,7 @@
241241
tool: cond-wf-003.1_nojs.cwl
242242
job: both-false.yml
243243
should_fail: True
244-
tags: [ conditional, multiple_input, workflow ]
244+
tags: [ conditional, multiple_input, workflow, inputs_should_parse ]
245245

246246
- id: first_non_null_second_non_null_nojs
247247
doc: "pickValue: first_non_null second item is non null; no javascript"
@@ -264,14 +264,14 @@
264264
tool: cond-wf-004_nojs.cwl
265265
job: test-true.yml
266266
should_fail: True
267-
tags: [ conditional, multiple_input, workflow ]
267+
tags: [ conditional, multiple_input, workflow, inputs_should_parse ]
268268

269269
- id: all_non_null_multi_with_non_array_output_nojs
270270
doc: "pickValue: all_non_null will fail validation; no javascript"
271271
tool: cond-wf-005_nojs.cwl
272272
job: test-true.yml
273273
should_fail: True
274-
tags: [ conditional, multiple_input, workflow ]
274+
tags: [ conditional, multiple_input, workflow, inputs_should_parse ]
275275

276276
- id: the_only_non_null_single_true_nojs
277277
doc: "pickValue: the_only_non_null will pass for only one active node; no javascript"
@@ -286,7 +286,7 @@
286286
tool: cond-wf-006_nojs.cwl
287287
job: both-true.yml
288288
should_fail: True
289-
tags: [ conditional, multiple_input, workflow ]
289+
tags: [ conditional, multiple_input, workflow, inputs_should_parse ]
290290

291291
- id: all_non_null_all_null_nojs
292292
doc: "pickValue: all_non_null will produce a list, even if empty; no javascript"
@@ -361,7 +361,7 @@
361361
tool: cond-wf-012_nojs.cwl
362362
job: ../empty.json
363363
should_fail: True
364-
tags: [ conditional, workflow ]
364+
tags: [ conditional, workflow, inputs_should_parse ]
365365

366366
- id: conditionals_multi_scatter_nojs
367367
doc: "Scatter two steps, flatten result + pickValue; no javascript"

tests/iwd/test-index.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,21 +269,21 @@
269269
tool: iwd-container-entryname2.cwl
270270
should_fail: true
271271
doc: "Test input mount locations when no container (should fail)"
272-
tags: [ initial_work_dir, command_line_tool ]
272+
tags: [ initial_work_dir, command_line_tool, inputs_should_parse ]
273273

274274
- job: ../loadContents/input.yml
275275
id: iwd-container-entryname3
276276
tool: iwd-container-entryname3.cwl
277277
should_fail: true
278278
doc: "Test input mount locations when container is a hint (should fail)"
279-
tags: [ initial_work_dir, command_line_tool ]
279+
tags: [ initial_work_dir, command_line_tool, inputs_should_parse ]
280280

281281
- job: ../loadContents/input.yml
282282
id: iwd-container-entryname4
283283
tool: iwd-container-entryname4.cwl
284284
should_fail: true
285285
doc: "Must fail if entryname starts with ../"
286-
tags: [ initial_work_dir, command_line_tool ]
286+
tags: [ initial_work_dir, command_line_tool, inputs_should_parse ]
287287

288288
- job: ../loadContents/input.yml
289289
id: iwdr_dir_literal_real_file

tests/loadContents/test-index.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
output: {}
1212
doc: "Test that loadContents on a file larger than 64k fails"
1313
should_fail: true
14-
tags: [ command_line_tool, required, json_schema_invalid ]
14+
tags: [ command_line_tool, required, json_schema_invalid, inputs_should_parse ]

tests/mixed-versions/test-index.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@
6060
test 1.2 wf that includes tools that are marked as v1.0 and v1.1 that
6161
contain v1.2 features (should fail)
6262
should_fail: true
63-
tags: [ workflow ]
63+
tags: [ workflow, inputs_should_parse ]

0 commit comments

Comments
 (0)