Skip to content

bpo-43592: Raise RLIMIT_NOFILE in test.libregrtest #29127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gpshead merged 6 commits into from
Oct 22, 2021
Merged

bpo-43592: Raise RLIMIT_NOFILE in test.libregrtest #29127

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b228f62
Raise RLIMIT_NOFILE in test.regrtest.
gpshead Oct 21, 2021
0fb8030
syntax typo fix
gpshead Oct 21, 2021
dffec91
Actually call the new method...
gpshead Oct 21, 2021
fc45c29
Minor refactoring, use 1024 to match a common Linux distro default.
gpshead Oct 21, 2021
508e12b
Move the code to libregrtest.setup setup_tests().
gpshead Oct 22, 2021
e434a4a
Add a NEWS entry.
gpshead Oct 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions Lib/test/libregrtest/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,24 @@ def cleanup(self):
print("Remove file: %s" % name)
os_helper.unlink(name)

def adjust_resource_limits(self):
Comment thread
gpshead marked this conversation as resolved.
Resolved
try:
import resource
from resource import RLIMIT_NOFILE, RLIM_INFINITY
except ImportError:
return
fd_limit, max_fds = resource.getrlimit(RLIMIT_NOFILE)
if fd_limit < 2000 and fd_limit < max_fds:
# On macOS the default fd limit is sometimes too low (256) for our
# test suite to succeed. Raise it to something more reasonable.
new_fd_limit = min(2000, max_fds)
try:
resource.setrlimit(RLIMIT_NOFILE, (new_fd_limit, max_fds))
print(f"Raised RLIMIT_NOFILE to {new_fd_limit}.")
except (ValueError, OSError) as err:
print(f"Unable to raise RLIMIT_NOFILE from {fd_limit} to "
f"{new_fd_limit}: {err}.")

def main(self, tests=None, **kwargs):
self.parse_args(kwargs)

Expand Down