From 6af67e028ece63b6be7b2cae136c9807705113cc Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Tue, 6 Feb 2024 10:21:45 +0100 Subject: [PATCH 1/2] Support older junit XML format in test result processing When running `make check` on a platform which has older (but still supported) pytest, e.g. 3.4.2 on EL8, the junit to trs conversion would fail because the junit format has different structure. Make the junit XML processing more lenient to support both the older and newer junit XML formats. (cherry picked from commit bec3dd10b3d71b55fd7b87a81db6b8236d0be13b) --- bin/tests/system/convert-junit-to-trs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tests/system/convert-junit-to-trs.py b/bin/tests/system/convert-junit-to-trs.py index b3d44b5567..9675825a50 100755 --- a/bin/tests/system/convert-junit-to-trs.py +++ b/bin/tests/system/convert-junit-to-trs.py @@ -13,7 +13,7 @@ from xml.etree import ElementTree def junit_to_trs(junit_xml): root = ElementTree.fromstring(junit_xml) - testcases = root.findall("./testsuite/testcase") + testcases = root.findall(".//testcase") if len(testcases) < 1: print(":test-result: ERROR convert-junit-to-trs.py") From 2dd238dbd013f022509b1c3aac6880529224c461 Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Tue, 6 Feb 2024 10:34:41 +0100 Subject: [PATCH 2/2] Add CHANGES note for [GL #4560] (cherry picked from commit 06a977a699a61fdd01742396bca1473b3a9ea713) --- CHANGES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index 215d1d7182..704e474911 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +6340. [test] Fix incorrectly reported errors when running tests + with `make test` on platforms with older pytest. + [GL #4560] + 6338. [func] Optimize slabheader placement, so the infrastructure records are put in the beginning of the slabheader linked list. [GL !8675]