Skip to content

Commit 8c4cd7e

Browse files
wxtimMetRonnieoliver-sanders
authored
Test.example replace a reftest (#5860)
Update tests/integration/triggering.py Co-authored-by: Ronnie Dutta <[email protected]> Co-authored-by: Oliver Sanders <[email protected]>
1 parent 6f62691 commit 8c4cd7e

File tree

7 files changed

+62
-59
lines changed

7 files changed

+62
-59
lines changed

‎tests/functional/triggering/09-fail.t‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎tests/functional/triggering/09-fail/flow.cylc‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎tests/functional/triggering/09-fail/reference.log‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎tests/integration/test_scan_api.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ async def flows(mod_flow, mod_scheduler, mod_run, mod_one_conf):
8080
}
8181
},
8282
'runtime': {
83-
'one': {
84-
'execution time limit': 'PT10S'
83+
'foo': {
84+
'simulation': {'default run length': 'PT10S'}
8585
}
8686
}
8787
},
8888
name='-running-'
8989
)
90-
schd2 = mod_scheduler(reg2, run_mode='simulation', paused_start=False)
90+
schd2 = mod_scheduler(reg2, paused_start=False)
9191

9292
# run cylc run
9393
async with mod_run(schd1):

‎tests/integration/test_triggering.py‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# THIS FILE IS PART OF THE CYLC WORKFLOW ENGINE.
2+
# Copyright (C) NIWA & British Crown (Met Office) & Contributors.
3+
#
4+
# This program is free software: you can redistribute it and/or modify
5+
# it under the terms of the GNU General Public License as published by
6+
# the Free Software Foundation, either version 3 of the License, or
7+
# (at your option) any later version.
8+
#
9+
# This program is distributed in the hope that it will be useful,
10+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
13+
#
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
17+
async def test_fail(flow, scheduler, run, reflog, complete, validate):
18+
"""Test triggering on :fail"""
19+
id_ = flow({
20+
'scheduler': {
21+
'allow implicit tasks': 'true'
22+
},
23+
'scheduling': {
24+
'graph': {
25+
'R1': 'foo:failed => bar'
26+
}
27+
},
28+
'runtime': {
29+
'root': {
30+
'simulation': {'default run length': 'PT0S'}
31+
},
32+
'foo': {
33+
'simulation': {'fail cycle points': 'all'}
34+
}
35+
}
36+
})
37+
schd = scheduler(id_, paused_start=False)
38+
39+
async with run(schd):
40+
triggers = reflog(schd)
41+
await complete(schd)
42+
43+
assert triggers == {
44+
('1/foo', None),
45+
('1/bar', ('1/foo',)),
46+
}

‎tests/integration/tui/screenshots/test_scheduler_logs.workflow-configuration-file.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">Path: mypath </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
44
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">&lt;</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#e5e5e5;background:#000000">S</span><span style="color:#000000;background:#e5e5e5">elect File </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">&gt;</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
55
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
6-
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">[runtime] </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
7-
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> [[a]] </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
86
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">[scheduling] </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
97
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> [[graph]] </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
108
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> R1 = a </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
11-
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
12-
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
13-
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
9+
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">[runtime] </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
10+
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> [[a]] </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
11+
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> [[root]] </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
12+
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> [[[simulation]]] </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
13+
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> default run length = PT0S </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
1414
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
1515
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>
1616
<span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5"> </span><span style="color:#000000;background:#e5e5e5">│</span>

‎tests/integration/utils/flow_tools.py‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,14 @@ def _make_flow(
6666
flow_run_dir = (test_dir / name)
6767
flow_run_dir.mkdir(parents=True, exist_ok=True)
6868
id_ = str(flow_run_dir.relative_to(cylc_run_dir))
69-
conf = flow_config_str({
70-
# override the default simulation runtime logic to make
71-
# tasks execute instantly
72-
# NOTE: this is prepended so it can be overwritten
73-
'runtime': {
74-
'root': {
75-
'simulation': {
76-
'default run length': 'PT0S',
77-
},
78-
},
79-
},
80-
**conf,
81-
})
69+
# set the default simulation runtime to zero (can be overridden)
70+
(
71+
conf.setdefault('runtime', {})
72+
.setdefault('root', {})
73+
.setdefault('simulation', {})
74+
.setdefault('default run length', 'PT0S')
75+
)
76+
conf = flow_config_str(conf)
8277
with open((flow_run_dir / WorkflowFiles.FLOW_FILE), 'w+') as flow_file:
8378
flow_file.write(conf)
8479
return id_

0 commit comments

Comments
 (0)