Author: Ronan Lamy <[email protected]>
Branch: py3.5
Changeset: r88299:e7411922252b
Date: 2016-11-10 17:04 +0000
http://bitbucket.org/pypy/pypy/changeset/e7411922252b/
Log: Fix timeouts in test_urllib2_localnet.py and skip tests that now
segfault
diff --git a/lib-python/3/ssl.py b/lib-python/3/ssl.py
--- a/lib-python/3/ssl.py
+++ b/lib-python/3/ssl.py
@@ -745,8 +745,7 @@
# non-blocking
raise ValueError("do_handshake_on_connect should not
be specified for non-blocking sockets")
self.do_handshake()
-
- except (OSError, ValueError):
+ except:
self.close()
raise
diff --git a/lib-python/3/test/test_urllib2_localnet.py
b/lib-python/3/test/test_urllib2_localnet.py
--- a/lib-python/3/test/test_urllib2_localnet.py
+++ b/lib-python/3/test/test_urllib2_localnet.py
@@ -544,6 +544,7 @@
self.assertEqual(handler.requests, ["/bizarre", b"get=with_feeling"])
def test_https(self):
+ self.skipTest('Segfaults on PyPy')
handler = self.start_https_server()
context = ssl.create_default_context(cafile=CERT_localhost)
data = self.urlopen("https://localhost:%s/bizarre"; % handler.port,
context=context)
@@ -573,6 +574,7 @@
cadefault=True)
def test_https_sni(self):
+ self.skipTest('Segfaults on PyPy')
if ssl is None:
self.skipTest("ssl module required")
if not ssl.HAS_SNI:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
