summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Skeleton (bot) <31488909+miss-islington@users.noreply.github.com>2020-10-20 01:44:05 (GMT)
committerGitHub <noreply@github.com>2020-10-20 01:44:05 (GMT)
commit3faef630a44be2d1ea5516e85e95fef4fd027a95 (patch)
treeec073a47ab70d0824f52b0e5c6f25b526b743f7a
parent371146a3f8a989964e2a9c0efc7d776815410fac (diff)
downloadcpython-3faef630a44be2d1ea5516e85e95fef4fd027a95.zip
cpython-3faef630a44be2d1ea5516e85e95fef4fd027a95.tar.gz
cpython-3faef630a44be2d1ea5516e85e95fef4fd027a95.tar.bz2
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>
-rw-r--r--Lib/test/test_asyncio/test_events.py2
-rw-r--r--Misc/ACKS1
2 files changed, 3 insertions, 0 deletions
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 85838f1..cec7e94 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -1071,6 +1071,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()
@@ -1096,6 +1097,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 5584d5d..35cabc7 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -67,6 +67,7 @@ Alexandru Ardelean
Emmanuel Arias
Alicia Arlen
Jeffrey Armstrong
+Justin Turner Arthur
Jason Asbahr
David Ascher
Ammar Askar