Skip to content

Commit 992d335

Browse files
committed
Fix test that depends on order of icp vs cycling mode in the wflow config
1 parent 323cdde commit 992d335

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

cylc/flow/config.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -680,9 +680,10 @@ def prelim_process_graph(self) -> None:
680680
raise WorkflowConfigError('No workflow dependency graph defined.')
681681

682682
if (
683-
'cycling mode' not in self.cfg['scheduling'] and
684-
self.cfg['scheduling'].get('initial cycle point', '1') == '1' and
685-
all(item in ['graph', '1', 'R1'] for item in graphdict)
683+
self.cfg['scheduling'].get('cycling mode', INTEGER_CYCLING_TYPE)
684+
== INTEGER_CYCLING_TYPE
685+
and self.cfg['scheduling'].get('initial cycle point', '1') == '1'
686+
and all(item in ['graph', '1', 'R1'] for item in graphdict)
686687
):
687688
# Pure acyclic graph, assume integer cycling mode with '1' cycle
688689
self.cfg['scheduling']['cycling mode'] = INTEGER_CYCLING_TYPE

tests/functional/startup/01-log-flow-config.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ init_workflow "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
3030
stall timeout = PT0S
3131
restart timeout = PT0S # shut down when restarted with empty pool
3232
[scheduling]
33+
cycling mode = integer
3334
[[graph]]
3435
R1 = reloader => whatever
3536
[runtime]

0 commit comments

Comments
 (0)