summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorCharles-François Natali <neologix@free.fr>2011-12-14 18:28:56 (GMT)
committerCharles-François Natali <neologix@free.fr>2011-12-14 18:28:56 (GMT)
commit83ef2549de1f1f1eddf43934cacd6c57295e6681 (patch)
tree61df2563b67e63b9acea1a7b9f1c224c11c87bf0 /Lib/test
parent10db4dec61d85ad7e09c37e2d463c19fac06f9cf (diff)
downloadcpython-83ef2549de1f1f1eddf43934cacd6c57295e6681.zip
cpython-83ef2549de1f1f1eddf43934cacd6c57295e6681.tar.gz
cpython-83ef2549de1f1f1eddf43934cacd6c57295e6681.tar.bz2
Issue #13453: Fix a race condition in test_poplib.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_poplib.py22
1 files changed, 12 insertions, 10 deletions
diff --git a/Lib/test/test_poplib.py b/Lib/test/test_poplib.py
index 81af569..e3901b8 100644
--- a/Lib/test/test_poplib.py
+++ b/Lib/test/test_poplib.py
@@ -309,32 +309,34 @@ class TestTimeouts(TestCase):
def setUp(self):
self.evt = threading.Event()
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- self.sock.settimeout(3)
+ self.sock.settimeout(60) # Safety net. Look issue 11812
self.port = test_support.bind_port(self.sock)
- threading.Thread(target=self.server, args=(self.evt,self.sock)).start()
- time.sleep(.1)
+ self.thread = threading.Thread(target=self.server, args=(self.evt,self.sock))
+ self.thread.setDaemon(True)
+ self.thread.start()
+ self.evt.wait()
def tearDown(self):
- self.evt.wait()
+ self.thread.join()
+ del self.thread # Clear out any dangling Thread objects.
def server(self, evt, serv):
serv.listen(5)
+ evt.set()
try:
conn, addr = serv.accept()
- except socket.timeout:
- pass
- else:
conn.send(b"+ Hola mundo\n")
conn.close()
+ except socket.timeout:
+ pass
finally:
serv.close()
- evt.set()
def testTimeoutDefault(self):
self.assertTrue(socket.getdefaulttimeout() is None)
socket.setdefaulttimeout(30)
try:
- pop = poplib.POP3("localhost", self.port)
+ pop = poplib.POP3(HOST, self.port)
finally:
socket.setdefaulttimeout(None)
self.assertEqual(pop.sock.gettimeout(), 30)
@@ -351,7 +353,7 @@ class TestTimeouts(TestCase):
pop.sock.close()
def testTimeoutValue(self):
- pop = poplib.POP3("localhost", self.port, timeout=30)
+ pop = poplib.POP3(HOST, self.port, timeout=30)
self.assertEqual(pop.sock.gettimeout(), 30)
pop.sock.close()