From f00ba7335a1f4954197ea4eb7bcda861220e20eb Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:53:46 +0200 Subject: [PATCH] [3.13] gh-99242 Ignore error when running regression tests under certain conditions. (GH-121663) (GH-121669) (cherry picked from commit 0759cecd9d945dfbac2226febaba51f41195555c) Co-authored-by: Bas Bloemsaat Co-authored-by: Kevin Diem --- Lib/test/libregrtest/logger.py | 5 ++++- .../next/Tests/2024-07-13-11-04-44.gh-issue-99242.aGxnwz.rst | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Tests/2024-07-13-11-04-44.gh-issue-99242.aGxnwz.rst diff --git a/Lib/test/libregrtest/logger.py b/Lib/test/libregrtest/logger.py index a1257069273..fa1d4d575c8 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 00000000000..7d904f26a36 --- /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.