From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Mon, 15 Jun 2026 14:55:27 +0000 (+0200) Subject: [3.15] gh-148853: Catch PermissionError in test in_systemd_nspawn_sync_suppressed... X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b5eea71702cb9ecff6b79c72b1f680ae88617316;p=thirdparty%2FPython%2Fcpython.git [3.15] gh-148853: Catch PermissionError in test in_systemd_nspawn_sync_suppressed() (GH-148854) (#151506) 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> --- diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index f9601655dfe1..ebbce63852c4 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -3164,7 +3164,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 000000000000..9d3fbc2590dc --- /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.