diff --git a/Lib/test/test_asyncio/functional.py b/Lib/test/test_asyncio/functional.py index fbec462c1db..386cfcdb981 100644 --- a/Lib/test/test_asyncio/functional.py +++ b/Lib/test/test_asyncio/functional.py @@ -150,9 +150,14 @@ class TestSocketWrapper: server_hostname=server_hostname, do_handshake_on_connect=False) - ssl_sock.do_handshake() + try: + ssl_sock.do_handshake() + except: + ssl_sock.close() + raise + finally: + self.__sock.close() - self.__sock.close() self.__sock = ssl_sock def __getattr__(self, name): diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py index d02d441a830..78ab1eb8223 100644 --- a/Lib/test/test_asyncio/test_sslproto.py +++ b/Lib/test/test_asyncio/test_sslproto.py @@ -604,6 +604,8 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin): server_side=True) except ssl.SSLError: pass + except OSError: + pass finally: sock.close() @@ -640,6 +642,7 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin): except ssl.SSLError: pass finally: + orig_sock.close() sock.close() async def client(addr): @@ -653,6 +656,8 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin): writer.write(b'B') with self.assertRaises(ssl.SSLError): await reader.readline() + + writer.close() return 'OK' with self.tcp_server(server,