Skip to content

[bugfix] Fix cleanup crash for non-performance tests when the perflog_compat option is on #2716

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 20, 2022
Merged

[bugfix] Fix cleanup crash for non-performance tests when the perflog_compat option is on #2716

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
29786a7
Fix multiline perflog bug
ekouts Dec 20, 2022
5820c42
Fix multiline perflog bug
ekouts Dec 20, 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
10 changes: 6 additions & 4 deletions reframe/frontend/executors/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,9 @@ def finalize(self):

self._current_stage = 'finalize'
self._notify_listeners('on_task_success')
self._perflogger.log_performance(logging.INFO, self,
multiline=self._perflog_compat)
if self.check.is_performance_check():
self._perflogger.log_performance(logging.INFO, self,
multiline=self._perflog_compat)

@logging.time_function
def cleanup(self, *args, **kwargs):
Expand All @@ -397,8 +398,9 @@ def fail(self, exc_info=None):
self._failed_stage = self._current_stage
self._exc_info = exc_info or sys.exc_info()
self._notify_listeners('on_task_failure')
self._perflogger.log_performance(logging.INFO, self,
multiline=self._perflog_compat)
if self.check.is_performance_check():
self._perflogger.log_performance(logging.INFO, self,
multiline=self._perflog_compat)

def skip(self, exc_info=None):
self._skipped = True
Expand Down
18 changes: 16 additions & 2 deletions unittests/test_policies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,6 +989,20 @@ def perf1(self):
return _MyTest()


@pytest.fixture
def simple_test():
class _MySimpleTest(rfm.RunOnlyRegressionTest):
valid_systems = ['*']
valid_prog_environs = ['*']
executable = 'echo hello'

@sanity_function
def validate(self):
return sn.assert_found(r'hello', self.stdout)

return _MySimpleTest()


@pytest.fixture
def config_perflog(make_config_file):
def _config_perflog(fmt, perffmt=None, logging_opts=None):
Expand Down Expand Up @@ -1178,7 +1192,7 @@ def test_perf_logging_no_perfvars(make_runner, make_exec_ctx, perf_test,


def test_perf_logging_multiline(make_runner, make_exec_ctx, perf_test,
config_perflog, tmp_path):
simple_test, config_perflog, tmp_path):
make_exec_ctx(
config_perflog(
fmt=(
Expand All @@ -1193,7 +1207,7 @@ def test_perf_logging_multiline(make_runner, make_exec_ctx, perf_test,
)
logging.configure_logging(rt.runtime().site_config)
runner = make_runner()
testcases = executors.generate_testcases([perf_test])
testcases = executors.generate_testcases([perf_test, simple_test])
runner.runall(testcases)

logfile = tmp_path / 'perflogs' / 'generic' / 'default' / '_MyTest.log'
Expand Down