From af8332f1594ef95a14a5d858411168305466d46b Mon Sep 17 00:00:00 2001 From: Nick Begg Date: Mon, 15 Jun 2026 16:25:08 +0200 Subject: [PATCH] gh-148853: Catch PermissionError in test in_systemd_nspawn_sync_suppressed() (GH-148854) /run/ on my FreeBSD install is not readable causing failing test. (cherry picked from commit 35ce2e5f98c04cb8d1e442de5439d3151362e21b) Co-authored-by: Nick Begg Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> --- Lib/test/support/__init__.py | 2 +- .../next/Tests/2026-04-24-01-38-56.gh-issue-148853._uM4_Q.rst | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Tests/2026-04-24-01-38-56.gh-issue-148853._uM4_Q.rst diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 701d34bba2d4dd0..e0ca34cc1891707 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -3073,7 +3073,7 @@ def in_systemd_nspawn_sync_suppressed() -> bool: with open("/run/systemd/container", "rb") as fp: if fp.read().rstrip() != b"systemd-nspawn": return False - except FileNotFoundError: + except (FileNotFoundError, PermissionError): return False # If systemd-nspawn is used, O_SYNC flag will immediately diff --git a/Misc/NEWS.d/next/Tests/2026-04-24-01-38-56.gh-issue-148853._uM4_Q.rst b/Misc/NEWS.d/next/Tests/2026-04-24-01-38-56.gh-issue-148853._uM4_Q.rst new file mode 100644 index 000000000000000..9d3fbc2590dc7a2 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2026-04-24-01-38-56.gh-issue-148853._uM4_Q.rst @@ -0,0 +1,2 @@ +Fix tests failing on FreeBSD in test.support's +in_systemd_nspawn_sync_suppressed() due to unreadable /run directory.