Author: Edd Barrett <vex...@gmail.com>
Branch: detect_egd2
Changeset: r79672:e065a97685b3
Date: 2015-09-17 17:46 +0100
http://bitbucket.org/pypy/pypy/changeset/e065a97685b3/
Log: Fix an SSL test when LibreSSL is used.
diff --git a/pypy/module/_ssl/test/test_ssl.py
b/pypy/module/_ssl/test/test_ssl.py
--- a/pypy/module/_ssl/test/test_ssl.py
+++ b/pypy/module/_ssl/test/test_ssl.py
@@ -36,7 +36,8 @@
assert isinstance(_ssl.OPENSSL_VERSION_INFO, tuple)
assert len(_ssl.OPENSSL_VERSION_INFO) == 5
assert isinstance(_ssl.OPENSSL_VERSION, str)
- assert 'openssl' in _ssl.OPENSSL_VERSION.lower()
+ lower_version = _ssl.OPENSSL_VERSION.lower()
+ assert 'openssl' in lower_version or "libressl" in lower_version
assert isinstance(_ssl.ALERT_DESCRIPTION_ACCESS_DENIED, int)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
