Skip to content

[3.12] gh-110393: Remove watchdog with hardcoded timeout (GH-110400) #110445

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
vstinner merged 1 commit into from
Oct 5, 2023
Merged

[3.12] gh-110393: Remove watchdog with hardcoded timeout (GH-110400) #110445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions Lib/test/test_builtin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2178,8 +2178,6 @@ def _run_child(self, child, terminal_input):
if pid == 0:
# Child
try:
# Make sure we don't get stuck if there's a problem
signal.alarm(2)
os.close(r)
with open(w, "w") as wpipe:
child(wpipe)
Expand Down
7 changes: 0 additions & 7 deletions Lib/test/test_socketserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@
HAVE_FORKING = test.support.has_fork_support
requires_forking = unittest.skipUnless(HAVE_FORKING, 'requires forking')

def signal_alarm(n):
"""Call signal.alarm when it exists (i.e. not on Windows)."""
if hasattr(signal, 'alarm'):
signal.alarm(n)

# Remember real select() to avoid interferences with mocking
_real_select = select.select

Expand Down Expand Up @@ -68,12 +63,10 @@ class SocketServerTest(unittest.TestCase):
"""Test all socket servers."""

def setUp(self):
signal_alarm(60) # Kill deadlocks after 60 seconds.
self.port_seed = 0
self.test_files = []

def tearDown(self):
signal_alarm(0) # Didn't deadlock.
reap_children()

for fn in self.test_files:
Expand Down