MERGE: 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 efd91c7..dd21d5a 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()
del self.thread # Clear out any dangling Thread objects.
diff --git a/Misc/NEWS b/Misc/NEWS
index 1a226a5..4548d50 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1616,6 +1616,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_robotparser when mueblesmoraleda.com is flaky and
an overzealous DNS service (e.g. OpenDNS) redirects to a placeholder
Web site.