From 5e9f0d2f54609dc80302728984673db3c902c748 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 22 Apr 2025 22:22:57 -0500 Subject: [PATCH] gh-109981: Resolve situation on iOS regarding fd_count. (GH-132823) Modifies the test helper that counts the list of open file descriptors to use the optimised ``/dev/fd`` approach on all Apple platforms, not just macOS. This avoids crashes caused by guarded file descriptors. (cherry picked from commit 862fd890361005598a6f4614ea0608c8447831c2) Co-authored-by: John --- Lib/test/support/os_helper.py | 2 +- .../next/Tests/2025-04-23-02-23-37.gh-issue-109981.IX3k8p.rst | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Tests/2025-04-23-02-23-37.gh-issue-109981.IX3k8p.rst diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py index ae016441fdb9a8..26c467a7ad2a85 100644 --- a/Lib/test/support/os_helper.py +++ b/Lib/test/support/os_helper.py @@ -630,7 +630,7 @@ def fd_count(): """ if sys.platform.startswith(('linux', 'android', 'freebsd', 'emscripten')): fd_path = "/proc/self/fd" - elif sys.platform == "darwin": + elif support.is_apple: fd_path = "/dev/fd" else: fd_path = None diff --git a/Misc/NEWS.d/next/Tests/2025-04-23-02-23-37.gh-issue-109981.IX3k8p.rst b/Misc/NEWS.d/next/Tests/2025-04-23-02-23-37.gh-issue-109981.IX3k8p.rst new file mode 100644 index 00000000000000..175615258303bd --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2025-04-23-02-23-37.gh-issue-109981.IX3k8p.rst @@ -0,0 +1,3 @@ +The test helper that counts the list of open file descriptors now uses the +optimised ``/dev/fd`` approach on all Apple platforms, not just macOS. +This avoids crashes caused by guarded file descriptors.