Issue #19857: Make sure that test_imaplib reaps server threads even in face of

error upon client disconnection.

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)
+        with self.reaped_server(hdlr) as server:
             client = self.imap_class(*server.server_address)
             try:
                 yield server, client
             finally:
                 client.logout()
-            self.reap_server(server, thread)
 
     @reap_threads
     def test_connect(self):