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

test_poplib: skip stls_context test when SNI is not available
---

diff --git a/Lib/test/test_poplib.py b/Lib/test/test_poplib.py
index eac77aa6ffe2..aced2080a4c6 100644
--- a/Lib/test/test_poplib.py
+++ b/Lib/test/test_poplib.py
@@ -21,10 +21,14 @@ PORT = 0
 SUPPORTS_SSL = False
 if hasattr(poplib, 'POP3_SSL'):
     import ssl
+    from ssl import HAS_SNI
 
     SUPPORTS_SSL = True
     CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, "keycert3.pem")
     CAFILE = os.path.join(os.path.dirname(__file__) or os.curdir, "pycacert.pem")
+else:
+    HAS_SNI = False
+
 requires_ssl = skipUnless(SUPPORTS_SSL, 'SSL not supported')
 
 # the dummy data returned by server when LIST and RETR commands are issued
@@ -330,6 +334,7 @@ class TestPOP3Class(TestCase):
         self.assertEqual(resp, expected)
 
     @requires_ssl
+    @skipUnless(HAS_SNI, 'No SNI support in ssl module')
     def test_stls_context(self):
         expected = b'+OK Begin TLS negotiation'
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)