mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-20 07:31:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Solved a potential deadlock in test_telnetlib.py. Related to issue #11812

Browse source
This commit is contained in:
Jesus Cea 2011-11-08 16:20:46 +01:00
parent 32e4a58c06
commit c241df814f
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_telnetlib.py
View file

@ -21,7 +21,6 @@ def server(evt, serv):
conn.close() conn.close()
finally: finally:
serv.close() serv.close()
evt.set()
class GeneralTests(TestCase): class GeneralTests(TestCase):
@ -33,11 +32,8 @@ class GeneralTests(TestCase):
self.thread = threading.Thread(target=server, args=(self.evt,self.sock)) self.thread = threading.Thread(target=server, args=(self.evt,self.sock))
self.thread.start() self.thread.start()
self.evt.wait() self.evt.wait()
self.evt.clear()
time.sleep(.1)
def tearDown(self): def tearDown(self):
self.evt.wait()
self.thread.join() self.thread.join()
def testBasic(self): def testBasic(self):

2
Misc/NEWS
View file

@ -527,6 +527,8 @@ Tests
- Skip network tests when getaddrinfo() returns EAI_AGAIN, meaning a temporary - Skip network tests when getaddrinfo() returns EAI_AGAIN, meaning a temporary
failure in name resolution. failure in name resolution.
- Solved a potential deadlock in test_telnetlib.py. Related to issue #11812.
- Avoid failing in test_urllibnet.test_bad_address when some overzealous - Avoid failing in test_urllibnet.test_bad_address when some overzealous
DNS service (e.g. OpenDNS) resolves a non-existent domain name. The test DNS service (e.g. OpenDNS) resolves a non-existent domain name. The test
is now skipped instead. is now skipped instead.