From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 13 Jul 2024 10:24:17 +0000 (+0200)
Subject: [3.12] gh-99242 Ignore error when running regression tests under certain conditions... 
X-Git-Tag: v3.12.5~119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=32bbc3679684532f53d14fbf408053eb49dbe279;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-99242 Ignore error when running regression tests under certain conditions. (GH-121663) (GH-121670)

gh-99242 Ignore error when running regression tests under certain conditions. (GH-121663)
(cherry picked from commit 0759cecd9d945dfbac2226febaba51f41195555c)

Co-authored-by: Bas Bloemsaat <bas@bloemsaat.com>
Co-authored-by: Kevin Diem <kg.diem@gmail.com>
---

diff --git a/Lib/test/libregrtest/logger.py b/Lib/test/libregrtest/logger.py
index a12570692739..fa1d4d575c8f 100644
--- a/Lib/test/libregrtest/logger.py
+++ b/Lib/test/libregrtest/logger.py
@@ -43,7 +43,10 @@ class Logger:
 
     def get_load_avg(self) -> float | None:
         if hasattr(os, 'getloadavg'):
-            return os.getloadavg()[0]
+            try:
+                return os.getloadavg()[0]
+            except OSError:
+                pass
         if self.win_load_tracker is not None:
             return self.win_load_tracker.getloadavg()
         return None
diff --git a/Misc/NEWS.d/next/Tests/2024-07-13-11-04-44.gh-issue-99242.aGxnwz.rst b/Misc/NEWS.d/next/Tests/2024-07-13-11-04-44.gh-issue-99242.aGxnwz.rst
new file mode 100644
index 000000000000..7d904f26a36f
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2024-07-13-11-04-44.gh-issue-99242.aGxnwz.rst
@@ -0,0 +1,3 @@
+:func:`os.getloadavg` may throw :exc:`OSError` when running regression tests
+under certain conditions (e.g. chroot). This error is now caught and
+ignored, since reporting load average is optional.