[Python-checkins] r80379 - in python/branches/py3k: Lib/test/test_ssl.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Thu Apr 22 20:43:31 2010
New Revision: 80379

Log:
Merged revisions 80375 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80375 | antoine.pitrou | 2010-04-22 20:00:41 +0200 (jeu., 22 avril 2010) | 3 lines
  
  Skip test on old versions of OpenSSL
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_ssl.py

Modified: python/branches/py3k/Lib/test/test_ssl.py
==============================================================================
--- python/branches/py3k/Lib/test/test_ssl.py	(original)
+++ python/branches/py3k/Lib/test/test_ssl.py	Thu Apr 22 20:43:31 2010
@@ -221,6 +221,9 @@
     def test_algorithms(self):
         # Issue #8484: all algorithms should be available when verifying a
         # certificate.
+        # SHA256 was added in OpenSSL 0.9.8
+        if ssl.OPENSSL_VERSION_INFO < (0, 9, 8, 0, 15):
+            self.skipTest("SHA256 not available on %r" % ssl.OPENSSL_VERSION)
         # NOTE: https://sha256.tbs-internet.com is another possible test host
         remote = ("sha2.hboeck.de", 443)
         sha256_cert = os.path.join(os.path.dirname(__file__), "sha256.pem")