]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.15] gh-148853: Catch PermissionError in test in_systemd_nspawn_sync_suppressed...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Mon, 15 Jun 2026 14:55:27 +0000 (16:55 +0200)
committerGitHub <noreply@github.com>
Mon, 15 Jun 2026 14:55:27 +0000 (14:55 +0000)
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 <nick@stunttruck.net>
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
Lib/test/support/__init__.py
Misc/NEWS.d/next/Tests/2026-04-24-01-38-56.gh-issue-148853._uM4_Q.rst [new file with mode: 0644]

index f9601655dfe157a982db088fd3e77d803b04c0c3..ebbce63852c4b85f997fb09b5359d3a6ce219bd9 100644 (file)
@@ -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 (file)
index 0000000..9d3fbc2
--- /dev/null
@@ -0,0 +1,2 @@
+Fix tests failing on FreeBSD in test.support's
+in_systemd_nspawn_sync_suppressed()  due to unreadable /run directory.