From: Justin Turner Arthur <justinarthur@gmail.com>
Date: Tue, 20 Oct 2020 01:18:57 +0000 (-0500)
Subject: bpo-38912: fix close before connect callback in test_asyncio SSL tests (GH-22691)
X-Git-Tag: v3.10.0a2~148
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de73d432bb29f6439f2db16cb991e15e09c70c26;p=thirdparty%2FPython%2Fcpython.git

bpo-38912: fix close before connect callback in test_asyncio SSL tests (GH-22691)

Reduces the rate at which the ENV CHANGED failure occurs in test_asyncio SSL tests (due to unclosed transport), but does not 100% resolve it.
---

diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index ef9d6fc48e9f..b8fe466cd53d 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -1076,6 +1076,7 @@ class EventLoopTestsMixin:
                                                ssl=sslcontext_client,
                                                server_hostname='localhost')
         client, pr = self.loop.run_until_complete(f_c)
+        self.loop.run_until_complete(proto.connected)
 
         # close connection
         proto.transport.close()
@@ -1101,6 +1102,7 @@ class EventLoopTestsMixin:
                                           ssl=sslcontext_client,
                                           server_hostname='localhost')
         client, pr = self.loop.run_until_complete(f_c)
+        self.loop.run_until_complete(proto.connected)
 
         # extra info is available
         self.check_ssl_extra_info(client, peername=(host, port),
diff --git a/Misc/ACKS b/Misc/ACKS
index 687bcb2c6aba..0aab4567d6ee 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -70,6 +70,7 @@ Alexandru Ardelean
 Emmanuel Arias
 Alicia Arlen
 Jeffrey Armstrong
+Justin Turner Arthur
 Jason Asbahr
 David Ascher
 Ammar Askar