mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #17992: Add timeouts to asyncore and asynchat tests so that they won't accidentally hang.

Browse source
This commit is contained in:
Giampaolo Rodola' 2013-05-16 15:21:53 +02:00
parent 0d4f08cee3
commit 3cb09064a3
3 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/test/test_asyncore.py
View file

@ -20,7 +20,7 @@ except ImportError:
threading = None
HOST = support.HOST
TIMEOUT = 3
HAS_UNIX_SOCKETS = hasattr(socket, 'AF_UNIX')
class dummysocket:
@ -397,7 +397,10 @@ class DispatcherWithSendTests(unittest.TestCase):
self.assertEqual(cap.getvalue(), data*2)
finally:
t.join()
t.join(timeout=TIMEOUT)
if t.is_alive():
self.fail("join() timed out")
class DispatcherWithSendTests_UsePoll(DispatcherWithSendTests):
@ -789,7 +792,11 @@ class BaseTestAPI:
t = threading.Thread(target=lambda: asyncore.loop(timeout=0.1,
count=500))
t.start()
self.addCleanup(t.join)
def cleanup():
t.join(timeout=TIMEOUT)
if t.is_alive():
self.fail("join() timed out")
self.addCleanup(cleanup)
s = socket.socket(self.family, socket.SOCK_STREAM)
s.settimeout(.2)