https://github.com/python/cpython/commit/ff9198dab3b66bd31d33bae674181f2d24124ea2
commit: ff9198dab3b66bd31d33bae674181f2d24124ea2
branch: 3.13
author: Miss Islington (bot) <31488909+miss-isling...@users.noreply.github.com>
committer: serhiy-storchaka <storch...@gmail.com>
date: 2025-04-14T06:38:13Z
summary:
[3.13] gh-124986: Fix test_no_leaking in test_subprocess on NetBSD and FreeBSD
(GH-132476) (GH-132498)
On platforms where the file descriptor limit is larger than FD_SETSIZE
that test was always skipped (FreeBSD) or always failing (NetBSD).
(cherry picked from commit f7b24ffefda839f367b048c06879df6bded128a1)
Co-authored-by: Serhiy Storchaka <storch...@gmail.com>
files:
M Lib/test/test_subprocess.py
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index bf77779b32c8ef..7d72737e9cb066 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -40,6 +40,10 @@
import grp
except ImportError:
grp = None
+try:
+ import resource
+except ImportError:
+ resource = None
try:
import fcntl
@@ -1210,6 +1214,16 @@ def test_no_leaking(self):
max_handles = 1026 # too much for most UNIX systems
else:
max_handles = 2050 # too much for (at least some) Windows setups
+ if resource:
+ # And if it is not too much, try to make it too much.
+ try:
+ soft, hard = resource.getrlimit(resource.RLIMIT_NOFILE)
+ if soft > 1024:
+ resource.setrlimit(resource.RLIMIT_NOFILE, (1024, hard))
+ self.addCleanup(resource.setrlimit, resource.RLIMIT_NOFILE,
+ (soft, hard))
+ except (OSError, ValueError):
+ pass
handles = []
tmpdir = tempfile.mkdtemp()
try:
@@ -1224,7 +1238,9 @@ def test_no_leaking(self):
else:
self.skipTest("failed to reach the file descriptor limit "
"(tried %d)" % max_handles)
- # Close a couple of them (should be enough for a subprocess)
+ # Close a couple of them (should be enough for a subprocess).
+ # Close lower file descriptors, so select() will work.
+ handles.reverse()
for i in range(10):
os.close(handles.pop())
# Loop creating some subprocesses. If one of them leaks some fds,
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
