diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2022-05-12 06:33:36 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-11 18:33:36 -0400 |
commit | 069909af77171b1d925aed6cefe168a7e5e50f50 (patch) | |
tree | d31027412aa19a4c33832cc23b5f0d5e5d156792 /tests/test_crypto.py | |
parent | 5a30471edc26efd38cb052d1ed923f2626e60c45 (diff) | |
download | pyopenssl-git-069909af77171b1d925aed6cefe168a7e5e50f50.tar.gz |
repair CI (#1116)
* repair CI
* more fixes
* pypy39 requires latest cryptography
* Apply suggestions from code review
Co-authored-by: Alex Gaynor <alex.gaynor@gmail.com>
* use constant
* bump minimum version
* remove unneeded try
* fix
Co-authored-by: Alex Gaynor <alex.gaynor@gmail.com>
Diffstat (limited to 'tests/test_crypto.py')
-rw-r--r-- | tests/test_crypto.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/test_crypto.py b/tests/test_crypto.py index 8e8484c..6d60347 100644 --- a/tests/test_crypto.py +++ b/tests/test_crypto.py @@ -2077,8 +2077,8 @@ class TestX509(_PKeyInteractionTestsMixin): b"DNS:altnull.python.org\x00example.com, " b"email:null@python.org\x00user@example.org, " b"URI:http://null.python.org\x00http://example.org, " - b"IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1\n" - == str(ext).encode("ascii") + b"IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1" + == str(ext).encode("ascii").strip() ) def test_invalid_digest_algorithm(self): @@ -4090,7 +4090,11 @@ class TestX509StoreContext: with pytest.raises(X509StoreContextError) as exc: store_ctx.verify_certificate() - assert exc.value.args[0][2] == "self signed certificate" + # OpenSSL 1.1.x and 3.0.x have different error messages + assert exc.value.args[0][2] in [ + "self signed certificate", + "self-signed certificate", + ] assert exc.value.certificate.get_subject().CN == "Testing Root CA" def test_invalid_chain_no_root(self): |