Author: Alex Gaynor <alex.gay...@gmail.com> Branch: Changeset: r75979:9bd56d71be29 Date: 2015-02-18 07:57 -0800 http://bitbucket.org/pypy/pypy/changeset/9bd56d71be29/
Log: Fixed SSL tests on OpenSSLs without npn 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 @@ -236,6 +236,9 @@ def test_npn_protocol(self): import socket, _ssl, gc + if not _ssl.HAS_NPN: + skip("NPN requires OpenSSL 1.0.1 or greater") + ctx = _ssl._SSLContext(_ssl.PROTOCOL_TLSv1) ctx._set_npn_protocols(b'\x08http/1.1\x06spdy/2') ss = ctx._wrap_socket(self.s._sock, True, _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit