Skip to content

Commit 515c213

Browse files
authored
update cwl testing (#460)
* CWL tests: add IDs. * custom-types example: don't use Docker Image Format v1 container.
1 parent 2773ed5 commit 515c213

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

src/_includes/cwl/custom-types/custom-types.cwl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ requirements:
1313

1414
hints:
1515
DockerRequirement:
16-
dockerPull: 'quay.io/biocontainers/biom-format:2.1.6--py27_0'
16+
dockerPull: 'quay.io/biocontainers/biom-format:2.1.15'
1717
SoftwareRequirement:
1818
packages:
1919
biom-format:
2020
specs: [ "https://doi.org/10.1186/2047-217X-1-7" ]
21-
version: [ "2.1.6" ]
21+
version: [ "2.1.15" ]
2222

2323
inputs:
2424
biom:

src/_includes/cwl/cwl_tests.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Expressions
22
- doc: Test for Expressions section
3+
id: expressions
34
job: expressions/empty.yml
45
tool: expressions/expression.cwl
56
output:
@@ -12,12 +13,14 @@
1213

1314
# Inputs
1415
- doc: Test for Essential Inputs section
16+
id: essential-inputs
1517
job: inputs/inp-job.yml
1618
tool: inputs/inp.cwl
1719
should_fail: false
1820
output: {}
1921

2022
- doc: Test for Array Inputs section
23+
id: array-inputs
2124
job: inputs/array-inputs-job.yml
2225
tool: inputs/array-inputs.cwl
2326
output:
@@ -29,11 +32,13 @@
2932
size: 60
3033

3134
- doc: Test for Include and Exclusive Inputs section (1st example)
35+
id: include-exclusive-inputs1
3236
job: inputs/record-job1.yml
3337
tool: inputs/record.cwl
3438
should_fail: true
3539

3640
- doc: Test for Include and Exclusive Inputs section (2nd example)
41+
id: include-exclusive-inputs2
3742
job: inputs/record-job2.yml
3843
tool: inputs/record.cwl
3944
output:
@@ -45,6 +50,7 @@
4550
size: 23
4651

4752
- doc: Test for Include and Exclusive Inputs section (3rd example)
53+
id: include-exclusive-inputs3
4854
job: inputs/record-job3.yml
4955
tool: inputs/record.cwl
5056
output:
@@ -57,6 +63,7 @@
5763

5864
# Additional Arguments and Parameters
5965
- doc: Test for Additional Arguments and Parameters section
66+
id: additional-arguments-and-parameters
6067
job: additional-arguments-and-parameters/arguments-job.yml
6168
tool: additional-arguments-and-parameters/arguments.cwl
6269
output:
@@ -69,6 +76,7 @@
6976

7077
# Parameter References
7178
- doc: Test for Parameter References section
79+
id: parameter-references
7280
job: parameter-references/tar-param-job.yml
7381
tool: parameter-references/tar-param.cwl
7482
output:
@@ -81,6 +89,7 @@
8189

8290
# Outputs
8391
- doc: Test for Outputs section
92+
id: outputs-section
8493
job: outputs/tar-job.yml
8594
tool: outputs/tar.cwl
8695
output:
@@ -92,6 +101,7 @@
92101
size: 0
93102

94103
- doc: Test for Outputs, Capturing Standard Output section
104+
id: outputs-capturing-stdout
95105
job: outputs/echo-job.yml
96106
tool: outputs/stdout.cwl
97107
output:
@@ -103,6 +113,7 @@
103113
size: 13
104114

105115
- doc: Test for Outputs, Array Outputs section
116+
id: outputs-array-outputs
106117
job: outputs/array-outputs-job.yml
107118
tool: outputs/array-outputs.cwl
108119
output:
@@ -121,17 +132,19 @@
121132
# Custom Types
122133
# NOTE: The checksum is always changed for every execution
123134
- doc: Test for Custom Types section
135+
id: custom-types
124136
job: custom-types/custom-types.yml
125137
tool: custom-types/custom-types.cwl
126138
output:
127139
result:
128140
class: File
129141
basename: rich_sparse_otu_table.hdf5
130142
location: Any
131-
size: 46992
143+
size: 46936
132144

133145
# Workflows
134146
- doc: Test for Workflows section
147+
id: workflows-1st-workflow
135148
job: workflows/1st-workflow-job.yml
136149
tool: workflows/1st-workflow.cwl
137150
output:
@@ -144,6 +157,7 @@
144157

145158
- doc: Test for Workflows, Nested Workflows section
146159
tool: workflows/nestedworkflows.cwl
160+
id: workflows-nestedworkflows
147161
output:
148162
classout:
149163
class: File
@@ -164,6 +178,7 @@
164178

165179
# Environment Variables
166180
- doc: Test for Environment Variables section
181+
id: environment-variables
167182
job: environment-variables/echo-job.yml
168183
tool: environment-variables/env.cwl
169184
output:
@@ -174,6 +189,7 @@
174189

175190
# Using Containers
176191
- doc: Test for Using Containers section
192+
id: using-containers
177193
job: using-containers/docker-job.yml
178194
tool: using-containers/docker.cwl
179195
output:
@@ -186,6 +202,7 @@
186202

187203
# Creating files at runtime
188204
- doc: Test for Creating files at runtime section
205+
id: creating-files-at-runtime
189206
job: creating-files-at-runtime/echo-job.yml
190207
tool: creating-files-at-runtime/createfile.cwl
191208
output:
@@ -198,6 +215,7 @@
198215

199216
# Staging input files
200217
- doc: Test for Staging input files section
218+
id: staging-input-files
201219
job: staging-input-files/arguments-job.yml
202220
tool: staging-input-files/linkfile.cwl
203221
output:
@@ -211,6 +229,7 @@
211229
# File formats
212230
# NOTE: The checksum and size is always changed for every execution
213231
- doc: Test for File formats section
232+
id: file-formats
214233
job: file-formats/sample.yml
215234
tool: file-formats/metadata_example.cwl
216235
output:
@@ -222,6 +241,7 @@
222241
# Metadata and authorship
223242
# NOTE: The checksum and size is always changed for every executions
224243
- doc: Test for Metadata and authorship section (1st example)
244+
id: metadata-and-authorship
225245
job: metadata-and-authorship/sample.yml
226246
tool: metadata-and-authorship/metadata_example2.cwl
227247
output:
@@ -231,6 +251,7 @@
231251
location: Any
232252

233253
- doc: Test for Metadata and authorship section (extended example)
254+
id: metadata-and-authorship-extended
234255
job: metadata-and-authorship/sample.yml
235256
tool: metadata-and-authorship/metadata_example3.cwl
236257
output:

0 commit comments

Comments
 (0)