From: Bill Janssen <janssen@parc.com>
Date: Thu, 17 Jul 2008 18:01:57 +0000 (+0000)
Subject: catch socket.error errors in badCertTest
X-Git-Tag: v2.6b2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c1dbf8792cd1d4a8f97070852a16f4afcd7f466;p=thirdparty%2FPython%2Fcpython.git

catch socket.error errors in badCertTest
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index b05b17eece4b..79dad649ce66 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -598,6 +598,9 @@ else:
             except ssl.SSLError, x:
                 if test_support.verbose:
                     sys.stdout.write("\nSSLError is %s\n" % x[1])
+            except socket.error, x:
+                if test_support.verbose:
+                    sys.stdout.write("\nsocket.error is %s\n" % x[1])
             else:
                 raise test_support.TestFailed(
                     "Use of invalid cert should have failed!")