Skip to content

[bugfix] Properly expand environment variables for the filelog log handler #1659

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 15, 2020
Merged

[bugfix] Properly expand environment variables for the filelog log handler #1659

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
d01633f
Properly expand environment variables for the filelog log handler
Dec 15, 2020
e6ecd1e
Merge branch 'master' into bugfix/perflodir-expandvars
Dec 15, 2020
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
6 changes: 4 additions & 2 deletions reframe/core/logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,10 @@ def _create_file_handler(site_config, config_prefix):


def _create_filelog_handler(site_config, config_prefix):
basedir = os.path.abspath(site_config.get(f'{config_prefix}/basedir'))
prefix = site_config.get(f'{config_prefix}/prefix')
basedir = os.path.abspath(
osext.expandvars(site_config.get(f'{config_prefix}/basedir'))
)
prefix = osext.expandvars(site_config.get(f'{config_prefix}/prefix'))
filename_patt = os.path.join(basedir, prefix)
append = site_config.get(f'{config_prefix}/append')
return MultiFileHandler(filename_patt, mode='a+' if append else 'w+')
Expand Down
16 changes: 15 additions & 1 deletion unittests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,22 @@ def test_performance_check_failure(run_reframe, tmp_path, perflogdir):
'default' / 'PerformanceFailureCheck.log')


def test_performance_report(run_reframe):
def test_perflogdir_from_env(run_reframe, tmp_path, monkeypatch):
monkeypatch.setenv('FOODIR', str(tmp_path / 'perflogs'))
returncode, stdout, stderr = run_reframe(
checkpath=['unittests/resources/checks/frontend_checks.py'],
more_options=['-t', 'PerformanceFailureCheck'],
perflogdir='$FOODIR'
)
assert returncode == 1
assert 'Traceback' not in stdout
assert 'Traceback' not in stderr
assert os.path.exists(tmp_path / 'perflogs' / 'generic' /
'default' / 'PerformanceFailureCheck.log')


def test_performance_report(run_reframe):
returncode, stdout, _ = run_reframe(
checkpath=['unittests/resources/checks/frontend_checks.py'],
more_options=['-t', 'PerformanceFailureCheck', '--performance-report']
)
Expand Down