Skip to content

Commit 408951f

Browse files
rsaperstrsaperst
authored
[WX-1629] Add metadata value type tests (#7433)
1 parent 020fb1a commit 408951f

File tree

39 files changed

+393
-141
lines changed

39 files changed

+393
-141
lines changed

‎.github/workflows/integration_tests.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,13 @@ jobs:
102102
- uses: ./.github/set_up_cromwell_action #This github action will set up git-secrets, caching, java, and sbt.
103103
with:
104104
cromwell_repo_token: ${{ secrets.BROADBOT_GITHUB_TOKEN }}
105+
# Activate SSH and idle for 30 minutes
106+
# - name: Setup tmate session
107+
# uses: mxschmitt/action-tmate@v3
108+
# timeout-minutes: 30
109+
# with:
110+
# limit-access-to-actor: true
111+
# detached: true
105112
#This script bascially just looks up another script to run, assuming that the other script's filename is:
106113
#src/ci/bin/test${BUILD_TYPE}.sh. The first letter of the BUILD_TYPE is automatically capitalized when looking.
107114
- name: Run Integration Test

‎centaur/src/main/resources/standardTestCases/aliased_subworkflows.test‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ files {
1212
metadata {
1313
workflowName: aliased_subworkflows
1414
status: Succeeded
15-
"outputs.aliased_subworkflows.initial.0": "0"
16-
"outputs.aliased_subworkflows.initial.1": "1"
17-
"outputs.aliased_subworkflows.initial.2": "2"
18-
"outputs.aliased_subworkflows.intermediate.0": "1"
19-
"outputs.aliased_subworkflows.intermediate.1": "2"
20-
"outputs.aliased_subworkflows.intermediate.2": "3"
21-
"outputs.aliased_subworkflows.result.0": "2"
22-
"outputs.aliased_subworkflows.result.1": "3"
23-
"outputs.aliased_subworkflows.result.2": "4"
15+
"outputs.aliased_subworkflows.initial.0": 0
16+
"outputs.aliased_subworkflows.initial.1": 1
17+
"outputs.aliased_subworkflows.initial.2": 2
18+
"outputs.aliased_subworkflows.intermediate.0": 1
19+
"outputs.aliased_subworkflows.intermediate.1": 2
20+
"outputs.aliased_subworkflows.intermediate.2": 3
21+
"outputs.aliased_subworkflows.result.0": 2
22+
"outputs.aliased_subworkflows.result.1": 3
23+
"outputs.aliased_subworkflows.result.2": 4
2424
}

‎centaur/src/main/resources/standardTestCases/biscayne_new_runtime_attributes_lifesciences.test‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ files {
1212

1313
metadata {
1414
"calls.runtime_attributes_wf.runtime_attributes_task.runtimeAttributes.docker": "rockylinux:9",
15-
"calls.runtime_attributes_wf.runtime_attributes_task.runtimeAttributes.cpu": 4
15+
# FIXME/TODO:
16+
#
17+
# Runtime attributes are casted to String somewhere between WDL parsing and metadata checking in Centaur.
18+
# As a temporary measure to make this test pass, this test is expecting the CPU value to be a String.
19+
# This is an issue in Centaur and does not affect production.
20+
"calls.runtime_attributes_wf.runtime_attributes_task.runtimeAttributes.cpu": "4"
1621
"calls.runtime_attributes_wf.runtime_attributes_task.runtimeAttributes.memory": "6 GB"
1722
}

‎centaur/src/main/resources/standardTestCases/biscayne_new_runtime_attributes_tes.test‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ files {
99

1010
metadata {
1111
"calls.runtime_attributes_wf.runtime_attributes_task.runtimeAttributes.docker": "debian:latest",
12-
"calls.runtime_attributes_wf.runtime_attributes_task.runtimeAttributes.cpu": 4
12+
# FIXME/TODO:
13+
#
14+
# Runtime attributes are casted to String somewhere between WDL parsing and metadata checking in Centaur.
15+
# As a temporary measure to make this test pass, this test is expecting the CPU value to be a String.
16+
# This is an issue in Centaur and does not affect production.
17+
"calls.runtime_attributes_wf.runtime_attributes_task.runtimeAttributes.cpu": "4"
1318
"calls.runtime_attributes_wf.runtime_attributes_task.runtimeAttributes.memory": "4 GB"
1419
}

‎centaur/src/main/resources/standardTestCases/biscayne_read_functions_windows_line_endings.test‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ metadata {
1414
"outputs.biscayne_read_functions_windows_line_endings.map.y": 600
1515
"outputs.biscayne_read_functions_windows_line_endings.map.z": 700
1616
"outputs.biscayne_read_functions_windows_line_endings.map.x": 500
17-
"outputs.biscayne_read_functions_windows_line_endings.tsv.0": "[\"line1\",\"line one\"]"
18-
"outputs.biscayne_read_functions_windows_line_endings.tsv.1": "[\"line2\",\"line two\"]"
19-
"outputs.biscayne_read_functions_windows_line_endings.tsv.2": "[\"line3\",\"line three\"]"
17+
"outputs.biscayne_read_functions_windows_line_endings.tsv.0": ["line1","line one"]
18+
"outputs.biscayne_read_functions_windows_line_endings.tsv.1": ["line2","line two"]
19+
"outputs.biscayne_read_functions_windows_line_endings.tsv.2": ["line3","line three"]
2020
"outputs.biscayne_read_functions_windows_line_endings.lines.0": "line1"
2121
"outputs.biscayne_read_functions_windows_line_endings.lines.1": "line2"
2222
"outputs.biscayne_read_functions_windows_line_endings.lines.2": "line3"

‎centaur/src/main/resources/standardTestCases/conditionals.declarations_in_ifs.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ files {
88

99
metadata {
1010
workflowName: declarations_in_ifs
11-
"outputs.declarations_in_ifs.singles.0": "5"
11+
"outputs.declarations_in_ifs.singles.0": 5
1212
"outputs.declarations_in_ifs.singles.1": null
13-
"outputs.declarations_in_ifs.doubles.0": "10"
13+
"outputs.declarations_in_ifs.doubles.0": 10
1414
"outputs.declarations_in_ifs.doubles.1": null
1515
}

‎centaur/src/main/resources/standardTestCases/conditionals.ifs_in_scatters.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ files {
99
metadata {
1010
workflowName: ifs_in_scatters
1111
"outputs.ifs_in_scatters.mirrors.0": null
12-
"outputs.ifs_in_scatters.mirrors.1": "5"
12+
"outputs.ifs_in_scatters.mirrors.1": 5
1313
"outputs.ifs_in_scatters.mirrors.2": null
14-
"outputs.ifs_in_scatters.mirrors.3": "7"
14+
"outputs.ifs_in_scatters.mirrors.3": 7
1515
"outputs.ifs_in_scatters.mirrors.4": null
1616
}

‎centaur/src/main/resources/standardTestCases/conditionals.lots_of_nesting.test‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,32 @@ files {
1212
metadata {
1313
workflowName: lots_of_nesting
1414
"outputs.lots_of_nesting.a.0": null
15-
"outputs.lots_of_nesting.a.1": "5"
15+
"outputs.lots_of_nesting.a.1": 5
1616
"outputs.lots_of_nesting.a.2": null
17-
"outputs.lots_of_nesting.a.3": "7"
17+
"outputs.lots_of_nesting.a.3": 7
1818
"outputs.lots_of_nesting.a.4": null
19-
"outputs.lots_of_nesting.b.0": "5"
20-
"outputs.lots_of_nesting.b.1": "7"
21-
"outputs.lots_of_nesting.c.0.left": "5"
22-
"outputs.lots_of_nesting.c.0.right": "5"
23-
"outputs.lots_of_nesting.c.1.left": "5"
24-
"outputs.lots_of_nesting.c.1.right": "7"
25-
"outputs.lots_of_nesting.c.2.left": "7"
26-
"outputs.lots_of_nesting.c.2.right": "5"
27-
"outputs.lots_of_nesting.c.3.left": "7"
28-
"outputs.lots_of_nesting.c.3.right": "7"
29-
"outputs.lots_of_nesting.d.0.left": "5"
19+
"outputs.lots_of_nesting.b.0": 5
20+
"outputs.lots_of_nesting.b.1": 7
21+
"outputs.lots_of_nesting.c.0.left": 5
22+
"outputs.lots_of_nesting.c.0.right": 5
23+
"outputs.lots_of_nesting.c.1.left": 5
24+
"outputs.lots_of_nesting.c.1.right": 7
25+
"outputs.lots_of_nesting.c.2.left": 7
26+
"outputs.lots_of_nesting.c.2.right": 5
27+
"outputs.lots_of_nesting.c.3.left": 7
28+
"outputs.lots_of_nesting.c.3.right": 7
29+
"outputs.lots_of_nesting.d.0.left": 5
3030
"outputs.lots_of_nesting.d.0.right": null
31-
"outputs.lots_of_nesting.d.1.left": "5"
32-
"outputs.lots_of_nesting.d.1.right": "7"
33-
"outputs.lots_of_nesting.d.2.left": "7"
34-
"outputs.lots_of_nesting.d.2.right": "5"
35-
"outputs.lots_of_nesting.d.3.left": "7"
31+
"outputs.lots_of_nesting.d.1.left": 5
32+
"outputs.lots_of_nesting.d.1.right": 7
33+
"outputs.lots_of_nesting.d.2.left": 7
34+
"outputs.lots_of_nesting.d.2.right": 5
35+
"outputs.lots_of_nesting.d.3.left": 7
3636
"outputs.lots_of_nesting.d.3.right": null
3737
"outputs.lots_of_nesting.e.0": null
38-
"outputs.lots_of_nesting.e.1.left": "5"
39-
"outputs.lots_of_nesting.e.1.right": "7"
40-
"outputs.lots_of_nesting.e.2.left": "7"
41-
"outputs.lots_of_nesting.e.2.right": "5"
38+
"outputs.lots_of_nesting.e.1.left": 5
39+
"outputs.lots_of_nesting.e.1.right": 7
40+
"outputs.lots_of_nesting.e.2.left": 7
41+
"outputs.lots_of_nesting.e.2.right": 5
4242
"outputs.lots_of_nesting.e.3": null
4343
}

‎centaur/src/main/resources/standardTestCases/conditionals.scatters_in_ifs.test‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ files {
88

99
metadata {
1010
workflowName: scatters_in_ifs
11-
"outputs.scatters_in_ifs.inTruth.0": "0"
12-
"outputs.scatters_in_ifs.inTruth.1": "1"
13-
"outputs.scatters_in_ifs.inTruth.2": "2"
11+
"outputs.scatters_in_ifs.inTruth.0": 0
12+
"outputs.scatters_in_ifs.inTruth.1": 1
13+
"outputs.scatters_in_ifs.inTruth.2": 2
1414
"outputs.scatters_in_ifs.inLies": null
1515
}

‎centaur/src/main/resources/standardTestCases/conditionals.subworkflows_in_ifs.test‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ files {
1111

1212
metadata {
1313
workflowName: subworkflows_in_ifs
14-
"outputs.subworkflows_in_ifs.tjs.0": "1"
15-
"outputs.subworkflows_in_ifs.tjs.1": "2"
16-
"outputs.subworkflows_in_ifs.tjs.2": "3"
14+
"outputs.subworkflows_in_ifs.tjs.0": 1
15+
"outputs.subworkflows_in_ifs.tjs.1": 2
16+
"outputs.subworkflows_in_ifs.tjs.2": 3
1717
"outputs.subworkflows_in_ifs.fjs": null
1818
}

0 commit comments

Comments
 (0)