diff options
| author | Jesus Cea <jcea@jcea.es> | 2011-11-08 15:20:46 (GMT) |
|---|---|---|
| committer | Jesus Cea <jcea@jcea.es> | 2011-11-08 15:20:46 (GMT) |
| commit | c241df814f614e5e702d2517caf9c0e811a6ca1a (patch) | |
| tree | 91f179c233e878ea5a942f681f5d0b75ec7930a9 | |
| parent | 32e4a58c0656d1f3a6415cd099bf1e531bc37c01 (diff) | |
| download | cpython-c241df814f614e5e702d2517caf9c0e811a6ca1a.zip cpython-c241df814f614e5e702d2517caf9c0e811a6ca1a.tar.gz cpython-c241df814f614e5e702d2517caf9c0e811a6ca1a.tar.bz2 | |
Solved a potential deadlock in test_telnetlib.py. Related to issue #11812
| -rw-r--r-- | Lib/test/test_telnetlib.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 2 insertions, 4 deletions
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 @@ def server(evt, serv): conn.close() finally: serv.close() - evt.set() class GeneralTests(TestCase): @@ -33,11 +32,8 @@ class GeneralTests(TestCase): 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): @@ -527,6 +527,8 @@ Tests - 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. |