From: Miss Skeleton (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 20 Oct 2020 01:40:01 +0000 (-0700)
Subject: bpo-38912: fix close before connect callback in test_asyncio SSL tests (GH-22691)
X-Git-Tag: v3.9.1rc1~145
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e43bee7e114ec361efde34f4b546f984574e6653;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.
(cherry picked from commit de73d432bb29f6439f2db16cb991e15e09c70c26)

Co-authored-by: Justin Turner Arthur <justinarthur@gmail.com>
---

diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 7bc9c9a344c9..92b1522e956c 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -1075,6 +1075,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()
@@ -1100,6 +1101,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 3125600284da..2aa9a9de9370 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