Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expand comma separated platform names correctly #4880

Merged
merged 3 commits into from
May 19, 2022
Merged

Expand comma separated platform names correctly #4880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1d379b
test for platform comma separated definitions
wxtim May 18, 2022
c308795
expand comma separated platform names correctly
wxtim May 18, 2022
97134c8
Update cylc/flow/cfgspec/globalcfg.py
wxtim May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cylc/flow/cfgspec/globalcfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,9 +1493,11 @@ def load(self):
LOG.error(f'bad {conf_type} {fname}')
raise

# Expand platforms needs to be performed first because it
# manipulates the sparse config.
self._expand_platforms()
self._set_default_editors()
Copy link
Member

@MetRonnie MetRonnie May 19, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I think the fact that the dense config is expanded in a method called _set_default_editors() is a bit troublesome. I am addressing this as part of #4815)

self._no_platform_group_name_overlap()
self._expand_platforms()

def _set_default_editors(self):
# default to $[G]EDITOR unless an editor is defined in the config
Expand Down
45 changes: 45 additions & 0 deletions tests/functional/cylc-config/10-platform-expansion.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#!/usr/bin/env bash
# THIS FILE IS PART OF THE CYLC WORKFLOW ENGINE.
# Copyright (C) NIWA & British Crown (Met Office) & Contributors.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#-------------------------------------------------------------------------------
# Test cylc config expansion of platform section.
. "$(dirname "$0")/test_header"
#-------------------------------------------------------------------------------
set_test_number 2
#-------------------------------------------------------------------------------
cat > "global.cylc" <<__HEREDOC__
[platforms]
[[ \
foo, bar..., \
baz\d\d, qux\S\S \
]]
hosts = of_melkor, of_valar
__HEREDOC__

export CYLC_CONF_PATH="${PWD}"

TEST_NAME="${TEST_NAME_BASE}-names"
run_ok "${TEST_NAME}" cylc config --platform-names
cmp_ok "${TEST_NAME}.stdout" <<__HEREDOC__
localhost
foo
bar...
baz\d\d
qux\S\S

__HEREDOC__

exit