From: Charles-François Natali <cf.natali@gmail.com>
Date: Sat, 7 Dec 2013 19:27:41 +0000 (+0100)
Subject: Issue #19857: Make sure that test_imaplib reaps server threads even in face of
X-Git-Tag: v3.4.0b2~309
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b116e8b0281410bf3d9bb1d8db6ad020717cd09;p=thirdparty%2FPython%2Fcpython.git

Issue #19857: Make sure that test_imaplib reaps server threads even in face of
error upon client disconnection.
---

diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
index bafd62b63d2f..2834963484b1 100644
--- a/Lib/test/test_imaplib.py
+++ b/Lib/test/test_imaplib.py
@@ -211,13 +211,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):