diff options
| author | Charles-François Natali <cf.natali@gmail.com> | 2013-12-07 19:03:12 (GMT) |
|---|---|---|
| committer | Charles-François Natali <cf.natali@gmail.com> | 2013-12-07 19:03:12 (GMT) |
| commit | 2044b7e34547e55fa584ea1fdb8472276de12773 (patch) | |
| tree | 35d16173225dda373e8603cfa1ff911aa516d5e6 | |
| parent | 12f18289c0481ffc1731dfa606baa9f65baa6478 (diff) | |
| download | cpython-2044b7e34547e55fa584ea1fdb8472276de12773.zip cpython-2044b7e34547e55fa584ea1fdb8472276de12773.tar.gz cpython-2044b7e34547e55fa584ea1fdb8472276de12773.tar.bz2 | |
Issue #19857: Make sure that test_imaplib reaps server threads even in face of
error upon client disconnection.
| -rw-r--r-- | Lib/test/test_imaplib.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py index c37ea1d..2435be5 100644 --- a/Lib/test/test_imaplib.py +++ b/Lib/test/test_imaplib.py @@ -210,13 +210,12 @@ class BaseThreadedNetworkedTests(unittest.TestCase): @contextmanager def reaped_pair(self, hdlr): - server, thread = self.make_server((support.HOST, 0), hdlr) - client = self.imap_class(*server.server_address) - try: - yield server, client - finally: - client.logout() - self.reap_server(server, thread) + with self.reaped_server(hdlr) as server: + client = self.imap_class(*server.server_address) + try: + yield server, client + finally: + client.logout() @reap_threads def test_connect(self): |