Skip to content

[bugfix] Do not require handlers$ in the logging config #2692

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

Merged
merged 2 commits into from
Dec 7, 2022
Merged

[bugfix] Do not require handlers$ in the logging config #2692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94aed99
Do not require 'handlers$' in the logging config
vkarak Nov 25, 2022
b12934f
Merge branch 'master' into bugfix/relax-config-schema
Dec 7, 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
7 changes: 6 additions & 1 deletion reframe/core/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,12 @@ def select_subconfig(self, system_fullname=None,
f"for system '{system_fullname}'"
)

# Verify that all environments defined by the system are defined for
# Check that handlers$ are defined for the current system
if 'handlers$' not in local_config['logging'][0]:
raise ConfigError(f"'logging/handlers$' are not defined "
f"for system {system_fullname!r}")

# Check that all environments defined by the system are defined for
# the current system
if not ignore_resolve_errors:
sys_environs = {
Expand Down
1 change: 0 additions & 1 deletion reframe/schemas/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,6 @@
},
"target_systems": {"$ref": "#/defs/system_ref"}
},
"required": ["handlers$"],
"additionalProperties": false
}
},
Expand Down
8 changes: 8 additions & 0 deletions unittests/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,14 @@ def test_select_subconfig_ignore_no_section_errors():
site_config.select_subconfig(ignore_resolve_errors=True)


def test_select_subconfig_empty_logging():
site_config = config.load_config('reframe/core/settings.py')
site_config['logging'][0] = {}
with pytest.raises(ConfigError,
match=rf"'logging/handlers\$' are not defined"):
site_config.select_subconfig()


def test_select_subconfig(site_config):
site_config.select_subconfig('testsys')
assert len(site_config['systems']) == 1
Expand Down