From 9ab0613e43f6f34877df4e54a5579df887c97a02 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Salgado Date: Fri, 20 Nov 2026 17:06:33 +0000 Subject: [PATCH 1/2] Stream JUnit results in the release dashboard --- .github/workflows/check.yml | 2 ++ master/custom/release_dashboard.py | 12 ++++---- tests/test_release_dashboard_junit.py | 42 +++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 tests/test_release_dashboard_junit.py diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index bf07b26d..54958922 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -26,6 +26,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Check configuration run: make check PIP=pip BUILDBOT=buildbot PYTHON_VERSION=${{ matrix.python-version }} + - name: Check custom components + run: PYTHONPATH=master python -m unittest discover -s tests - name: Compare configuration reports run: | # Use the same formatter for both configurations, including older main revisions. diff --git a/master/custom/release_dashboard.py b/master/custom/release_dashboard.py index 3f0c024d..42852471 100644 --- a/master/custom/release_dashboard.py +++ b/master/custom/release_dashboard.py @@ -461,8 +461,13 @@ def junit_results(self): if not filepath.is_file(): return None - with filepath.open() as file: - etree = ElementTree.parse(file) + result = JunitResult(self, {}) + with filepath.open('rb') as file: + for _, element in ElementTree.iterparse(file, events=('end',)): + if element.tag == 'testcase': + if element.find('error') is not None: + result.add(element) + element.clear() # We don't have a logger set up, this returns None on common failures # (meaning failures won't show on the dashboard). @@ -472,9 +477,6 @@ def junit_results(self): except ElementTree.ParseError as e: return None - result = JunitResult(self, {}) - for element in etree.iterfind('.//error/..'): - result.add(element) return result @cached_property diff --git a/tests/test_release_dashboard_junit.py b/tests/test_release_dashboard_junit.py new file mode 100644 index 00000000..22609b78 --- /dev/null +++ b/tests/test_release_dashboard_junit.py @@ -0,0 +1,42 @@ +import tempfile +import unittest +from pathlib import Path +from types import SimpleNamespace + +from custom import release_dashboard as dashboard + + +class JUnitResultsTests(unittest.TestCase): + def setUp(self): + self.directory = tempfile.TemporaryDirectory() + self.addCleanup(self.directory.cleanup) + self.folder = Path(self.directory.name) / '3.15' / 'builder' + self.folder.mkdir(parents=True) + + def read_results(self, text): + (self.folder / 'build_1.xml').write_text(text) + app = SimpleNamespace(test_result_dir=Path(self.directory.name)) + parent = SimpleNamespace(_root=SimpleNamespace(_app=app)) + build = dashboard.Build(parent, {'number': 1}) + class Builder: + branch = SimpleNamespace(tag='3.15') + def __getitem__(self, key): + return 'builder' + build.__dict__['builder'] = Builder() + return build.junit_results + + def test_errors_keep_their_details(self): + result = self.read_results('' + 'details' + '') + self.assertEqual(result.error_types, {'AssertionError'}) + error = result.contents['module'].contents['method'].errors[0] + self.assertEqual(error['text'], 'details') + + def test_successful_cases_have_no_errors(self): + result = self.read_results('') + self.assertEqual(result.contents, {}) + + def test_malformed_xml_does_not_return_partial_results(self): + result = self.read_results('details') + self.assertIsNone(result) From bc47d04cc7b21de8d75d80f076ea4021c09d0217 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Salgado Date: Fri, 20 Nov 2026 18:27:00 +0000 Subject: [PATCH 2/2] Release XML elements after each suite --- .github/workflows/check.yml | 2 -- master/custom/release_dashboard.py | 2 ++ tests/test_release_dashboard_junit.py | 42 --------------------------- 3 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 tests/test_release_dashboard_junit.py diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 54958922..bf07b26d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -26,8 +26,6 @@ jobs: python-version: ${{ matrix.python-version }} - name: Check configuration run: make check PIP=pip BUILDBOT=buildbot PYTHON_VERSION=${{ matrix.python-version }} - - name: Check custom components - run: PYTHONPATH=master python -m unittest discover -s tests - name: Compare configuration reports run: | # Use the same formatter for both configurations, including older main revisions. diff --git a/master/custom/release_dashboard.py b/master/custom/release_dashboard.py index 42852471..e24c5f29 100644 --- a/master/custom/release_dashboard.py +++ b/master/custom/release_dashboard.py @@ -468,6 +468,8 @@ def junit_results(self): if element.find('error') is not None: result.add(element) element.clear() + elif element.tag == 'testsuite': + element.clear() # We don't have a logger set up, this returns None on common failures # (meaning failures won't show on the dashboard). diff --git a/tests/test_release_dashboard_junit.py b/tests/test_release_dashboard_junit.py deleted file mode 100644 index 22609b78..00000000 --- a/tests/test_release_dashboard_junit.py +++ /dev/null @@ -1,42 +0,0 @@ -import tempfile -import unittest -from pathlib import Path -from types import SimpleNamespace - -from custom import release_dashboard as dashboard - - -class JUnitResultsTests(unittest.TestCase): - def setUp(self): - self.directory = tempfile.TemporaryDirectory() - self.addCleanup(self.directory.cleanup) - self.folder = Path(self.directory.name) / '3.15' / 'builder' - self.folder.mkdir(parents=True) - - def read_results(self, text): - (self.folder / 'build_1.xml').write_text(text) - app = SimpleNamespace(test_result_dir=Path(self.directory.name)) - parent = SimpleNamespace(_root=SimpleNamespace(_app=app)) - build = dashboard.Build(parent, {'number': 1}) - class Builder: - branch = SimpleNamespace(tag='3.15') - def __getitem__(self, key): - return 'builder' - build.__dict__['builder'] = Builder() - return build.junit_results - - def test_errors_keep_their_details(self): - result = self.read_results('' - 'details' - '') - self.assertEqual(result.error_types, {'AssertionError'}) - error = result.contents['module'].contents['method'].errors[0] - self.assertEqual(error['text'], 'details') - - def test_successful_cases_have_no_errors(self): - result = self.read_results('') - self.assertEqual(result.contents, {}) - - def test_malformed_xml_does_not_return_partial_results(self): - result = self.read_results('details') - self.assertIsNone(result)