Solved a potential deadlock in test_telnetlib.py. Related to issue #11812
diff --git a/Lib/test/test_telnetlib.py b/Lib/test/test_telnetlib.py
index a78b938..0f0b2ac 100644
--- a/Lib/test/test_telnetlib.py
+++ b/Lib/test/test_telnetlib.py
@@ -21,7 +21,6 @@
conn.close()
finally:
serv.close()
- evt.set()
class GeneralTests(TestCase):
@@ -33,11 +32,8 @@
self.thread = threading.Thread(target=server, args=(self.evt,self.sock))
self.thread.start()
self.evt.wait()
- self.evt.clear()
- time.sleep(.1)
def tearDown(self):
- self.evt.wait()
self.thread.join()
def testBasic(self):
diff --git a/Misc/NEWS b/Misc/NEWS
index 0d5f981..5529786 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -527,6 +527,8 @@
- Skip network tests when getaddrinfo() returns EAI_AGAIN, meaning a temporary
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
DNS service (e.g. OpenDNS) resolves a non-existent domain name. The test
is now skipped instead.