Skip to content

[3.7] bpo-35352: test_asyncio uses the certificate set from the test directory (GH-10826) #10834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 2 commits into from
Nov 30, 2018
Merged

[3.7] bpo-35352: test_asyncio uses the certificate set from the test directory (GH-10826) #10834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1070c09
bpo-35352: test_asyncio uses the certificate set from the test direct…
stratakis Nov 30, 2018
f227605
bpo-35352: Cleanup test_asyncio/utils.py (GH-10831)
vstinner Nov 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 0 additions & 73 deletions Lib/test/test_asyncio/keycert3.pem
View file
Open in desktop

This file was deleted.

78 changes: 0 additions & 78 deletions Lib/test/test_asyncio/pycacert.pem
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions Lib/test/test_asyncio/ssl_cert.pem
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions Lib/test/test_asyncio/ssl_key.pem
View file
Open in desktop

This file was deleted.

10 changes: 2 additions & 8 deletions Lib/test/test_asyncio/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def data_file(filename):
fullname = os.path.join(support.TEST_HOME_DIR, filename)
if os.path.isfile(fullname):
return fullname
fullname = os.path.join(os.path.dirname(__file__), filename)
fullname = os.path.join(os.path.dirname(__file__), '..', filename)
if os.path.isfile(fullname):
return fullname
raise FileNotFoundError(filename)
Expand Down Expand Up @@ -156,14 +156,8 @@ def finish_request(self, request, client_address):
# contains the ssl key and certificate files) differs
# between the stdlib and stand-alone asyncio.
# Prefer our own if we can find it.
here = os.path.join(os.path.dirname(__file__), '..', 'tests')
if not os.path.isdir(here):
here = os.path.join(os.path.dirname(os.__file__),
'test', 'test_asyncio')
keyfile = os.path.join(here, 'ssl_key.pem')
certfile = os.path.join(here, 'ssl_cert.pem')
context = ssl.SSLContext()
context.load_cert_chain(certfile, keyfile)
context.load_cert_chain(ONLYCERT, ONLYKEY)

ssock = context.wrap_socket(request, server_side=True)
try:
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Tests/2018-11-30-17-18-56.bpo-35352.8bD7GC.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Modify test_asyncio to use the certificate set from the test directory.