fix for release blocker 3910, 2.6 regression in socket.ssl method
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 98681f4..5cfe7f1 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -34,6 +34,21 @@
if test_support.verbose:
sys.stdout.write(prefix + exc_format)
+ def testSimpleSSLwrap(self):
+ try:
+ ssl.sslwrap_simple(socket.socket(socket.AF_INET))
+ except IOError, e:
+ if e.errno == 32: # broken pipe when ssl_sock.do_handshake(), this test doesn't care about that
+ pass
+ else:
+ raise
+ try:
+ ssl.sslwrap_simple(socket.socket(socket.AF_INET)._sock)
+ except IOError, e:
+ if e.errno == 32: # broken pipe when ssl_sock.do_handshake(), this test doesn't care about that
+ pass
+ else:
+ raise
class BasicTests(unittest.TestCase):
@@ -58,7 +73,6 @@
finally:
s.close()
-
def testCrucialConstants(self):
ssl.PROTOCOL_SSLv2
ssl.PROTOCOL_SSLv23