aboutsummaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2020-12-16 03:48:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-16 03:48:17 +0000
commit9aaad515f82dd3e71514f900d45d1c7f3570c7b2 (patch)
tree7450b3f017cf92765a0c6b4b7f9bf08c032567dd /tests/conftest.py
parent7f7a955bfc3122c9c16b5eabffb4c5c8ff11c978 (diff)
parenta8bfc97dbaba42eb6f89c6646e7fb149f93dd3f0 (diff)
downloadpyopenssl-9aaad515f82dd3e71514f900d45d1c7f3570c7b2.tar.gz
Upgrade python/pyopenssl to 20.0.1 am: 85a0e4a2f1 am: a8bfc97dba
Original change: https://android-review.googlesource.com/c/platform/external/python/pyopenssl/+/1531280 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If3eeb5f43ea6e9adf9e1d9d1d7e199c01ec4f1b5
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 366624e..5bae6b8 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -12,7 +12,7 @@ def pytest_report_header(config):
return "OpenSSL: {openssl}\ncryptography: {cryptography}".format(
openssl=OpenSSL.SSL.SSLeay_version(OpenSSL.SSL.SSLEAY_VERSION),
- cryptography=cryptography.__version__
+ cryptography=cryptography.__version__,
)