From: Christian Heimes <christian@cheimes.de>
Date: Sun, 15 Dec 2013 18:39:32 +0000 (+0100)
Subject: test_imaplib: skip check_hostname test when SNI is not available
X-Git-Tag: v3.4.0b2~214
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aab99fdd653b6959937ce6eb66192a8881768761;p=thirdparty%2FPython%2Fcpython.git

test_imaplib: skip check_hostname test when SNI is not available
---

diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
index 2834963484b1..5e0eaeab2bd4 100644
--- a/Lib/test/test_imaplib.py
+++ b/Lib/test/test_imaplib.py
@@ -18,6 +18,9 @@ try:
     import ssl
 except ImportError:
     ssl = None
+    HAS_SNI = False
+else:
+    from ssl import HAS_SNI
 
 CERTFILE = None
 CAFILE = None
@@ -349,6 +352,7 @@ class ThreadedNetworkedTestsSSL(BaseThreadedNetworkedTests):
     imap_class = IMAP4_SSL
 
     @reap_threads
+    @unittest.skipUnless(HAS_SNI, 'No SNI support in ssl module')
     def test_ssl_verified(self):
         ssl_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
         ssl_context.verify_mode = ssl.CERT_REQUIRED