Harden compare-baseline status normalization logic

Author: cvanelteren

.github/workflows/build-ultraplot.yml

@@ -235,12 +235,18 @@ jobs:
               status=$?
               set -e
               echo "=== Memory after image comparison ===" && free -h
-              if [ "$status" -ne 0 ] && [ -f ./results/junit.xml ]; then
-                if python -c "import sys, xml.etree.ElementTree as ET; root = ET.parse('./results/junit.xml').getroot(); suites = list(root.findall('testsuite')) if root.tag == 'testsuites' else [root]; failures = sum(int(s.attrib.get('failures', 0) or 0) for s in suites); errors = sum(int(s.attrib.get('errors', 0) or 0) for s in suites); sys.exit(0 if (failures == 0 and errors == 0) else 1)"
-                then
-                  echo "pytest exited with $status but junit reports no failures/errors; overriding exit status to 0."
-                  status=0
-                fi
+              junit_failures=-1
+              junit_errors=-1
+              if [ -f ./results/junit.xml ]; then
+                junit_failures=$(sed -n 's/.*failures="\([0-9][0-9]*\)".*/\1/p' ./results/junit.xml | head -n 1)
+                junit_errors=$(sed -n 's/.*errors="\([0-9][0-9]*\)".*/\1/p' ./results/junit.xml | head -n 1)
+                junit_failures=${junit_failures:-0}
+                junit_errors=${junit_errors:-0}
+              fi
+              echo "pytest_status=$status junit_failures=$junit_failures junit_errors=$junit_errors"
+              if [ "$status" -ne 0 ] && [ "$junit_failures" -eq 0 ] && [ "$junit_errors" -eq 0 ]; then
+                echo "pytest exited with $status but junit reports no failures/errors; overriding exit status to 0."
+                status=0
               fi
               if [ "$status" -eq 4 ] || [ "$status" -eq 5 ]; then
                 echo "No tests collected from selected nodeids; skipping image comparison."
@@ -263,12 +269,18 @@ jobs:
             status=$?
             set -e
             echo "=== Memory after image comparison ===" && free -h
-            if [ "$status" -ne 0 ] && [ -f ./results/junit.xml ]; then
-              if python -c "import sys, xml.etree.ElementTree as ET; root = ET.parse('./results/junit.xml').getroot(); suites = list(root.findall('testsuite')) if root.tag == 'testsuites' else [root]; failures = sum(int(s.attrib.get('failures', 0) or 0) for s in suites); errors = sum(int(s.attrib.get('errors', 0) or 0) for s in suites); sys.exit(0 if (failures == 0 and errors == 0) else 1)"
-              then
-                echo "pytest exited with $status but junit reports no failures/errors; overriding exit status to 0."
-                status=0
-              fi
+            junit_failures=-1
+            junit_errors=-1
+            if [ -f ./results/junit.xml ]; then
+              junit_failures=$(sed -n 's/.*failures="\([0-9][0-9]*\)".*/\1/p' ./results/junit.xml | head -n 1)
+              junit_errors=$(sed -n 's/.*errors="\([0-9][0-9]*\)".*/\1/p' ./results/junit.xml | head -n 1)
+              junit_failures=${junit_failures:-0}
+              junit_errors=${junit_errors:-0}
+            fi
+            echo "pytest_status=$status junit_failures=$junit_failures junit_errors=$junit_errors"
+            if [ "$status" -ne 0 ] && [ "$junit_failures" -eq 0 ] && [ "$junit_errors" -eq 0 ]; then
+              echo "pytest exited with $status but junit reports no failures/errors; overriding exit status to 0."
+              status=0
             fi
             if [ "$status" -eq 4 ] || [ "$status" -eq 5 ]; then
               echo "No tests collected; skipping image comparison."