[feat] Extend the JUnit report

reframe/frontend/reporting/__init__.py

@@ -172,6 +172,14 @@ def _do_restore(self, testcase):
                 f'could not restore testcase {testcase!r}') from e
 
 
+def _tail_file(filename, num_lines):
+    try:
+        with open(filename, encoding='utf-8', errors='replace') as fp:
+            return ''.join(fp.readlines()[-num_lines:])
+    except OSError:
+        return ''
+
+
 def _expand_report_filename(filepatt, *, newfile):
     if '{sessionid}' not in os.fspath(filepatt):
         return filepatt
@@ -539,7 +547,28 @@ def generate_xml_report(self):
                         testcase, 'failure', attrib={'type': 'failure',
                                                      'message': fail_phase}
                     )
-                    testcase_msg.text = f"{tc['fail_phase']}: {fail_reason}"
+                    workdir = tc.get('outputdir') or tc.get('stagedir') or ''
+                    stdout = ''
+                    stderr = ''
+                    if workdir:
+                        job_stdout = tc.get('job_stdout')
+                        if job_stdout:
+                            stdout = _tail_file(
+                                os.path.join(workdir, job_stdout), 20
+                            )
+
+                        job_stderr = tc.get('job_stderr')
+                        if job_stderr:
+                            stderr = _tail_file(
+                                os.path.join(workdir, job_stderr), 20
+                            )
+
+                    testcase_msg.text = '\n\n'.join([
+                        f"{tc['fail_phase']}: {fail_reason}",
+                        workdir,
+                        stdout,
+                        stderr
+                    ])
 
             testsuite_stdout = etree.SubElement(xml_testsuite, 'system-out')
             testsuite_stdout.text = ''

unittests/test_reporting.py

@@ -85,6 +85,15 @@ def _generate_runreport(run_stats, time_start=None, time_end=None):
     return report
 
 
+def test_tail_file(tmp_path):
+    filename = tmp_path / 'output.txt'
+    filename.write_text('line1\nline2\nline3\n')
+
+    assert reporting._tail_file(filename, 20) == 'line1\nline2\nline3\n'
+    assert reporting._tail_file(filename, 2) == 'line2\nline3\n'
+    assert reporting._tail_file(tmp_path / 'missing.txt', 20) == ''
+
+
 def test_run_report(make_runner, make_cases, common_exec_ctx, tmp_path):
     runner = make_runner()
     with _timer() as tm:
@@ -100,7 +109,35 @@ def test_run_report(make_runner, make_cases, common_exec_ctx, tmp_path):
     report['runs'][0]['testcases'][-1]['time_total'] = None
 
     # Validate the junit report
-    _validate_junit_report(report.generate_xml_report())
+    junit_report = report.generate_xml_report()
+    _validate_junit_report(junit_report)
+    for tc, xml_tc in zip(report['runs'][0]['testcases'],
+                          junit_report.findall('.//testcase')):
+        failure = xml_tc.find('failure')
+        if tc['result'] != 'fail':
+            assert failure is None
+            continue
+
+        workdir = tc.get('outputdir') or tc.get('stagedir') or ''
+        stdout = ''
+        stderr = ''
+        if workdir:
+            if tc['job_stdout']:
+                stdout = reporting._tail_file(
+                    os.path.join(workdir, tc['job_stdout']), 20
+                )
+
+            if tc['job_stderr']:
+                stderr = reporting._tail_file(
+                    os.path.join(workdir, tc['job_stderr']), 20
+                )
+
+        assert failure.text == '\n\n'.join([
+            f"{tc['fail_phase']}: {tc['fail_reason']}",
+            workdir,
+            stdout,
+            stderr
+        ])
 
     # Read and validate the report using the `reporting` module
     reporting.restore_session(tmp_path / 'report.json')