diff options
| author | Jesus Cea <jcea@jcea.es> | 2011-11-08 15:34:22 (GMT) |
|---|---|---|
| committer | Jesus Cea <jcea@jcea.es> | 2011-11-08 15:34:22 (GMT) |
| commit | 0fd66b8f303c03fbe5c357e75f088641d82f535b (patch) | |
| tree | 7ad79a29f75c101b879e5708e7626a39db9e960c /Lib/test/test_telnetlib.py | |
| parent | 217f05b3edbcab4dfcf5ce79cbc963ac1bd6c2a1 (diff) | |
| parent | c241df814f614e5e702d2517caf9c0e811a6ca1a (diff) | |
| download | cpython-0fd66b8f303c03fbe5c357e75f088641d82f535b.zip cpython-0fd66b8f303c03fbe5c357e75f088641d82f535b.tar.gz cpython-0fd66b8f303c03fbe5c357e75f088641d82f535b.tar.bz2 | |
MERGE: Solved a potential deadlock in test_telnetlib.py. Related to issue #11812
Diffstat (limited to 'Lib/test/test_telnetlib.py')
| -rw-r--r-- | Lib/test/test_telnetlib.py | 4 |
1 files changed, 0 insertions, 4 deletions
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 @@ 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() del self.thread # Clear out any dangling Thread objects. |