[Python-checkins] r80378 - in python/branches/release26-maint: Lib/test/test_ssl.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Thu Apr 22 20:42:58 2010
New Revision: 80378

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/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_ssl.py

Modified: python/branches/release26-maint/Lib/test/test_ssl.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_ssl.py	(original)
+++ python/branches/release26-maint/Lib/test/test_ssl.py	Thu Apr 22 20:42:58 2010
@@ -190,7 +190,12 @@
         if test_support.verbose:
             sys.stdout.write("\nVerified certificate for svn.python.org:443 is\n%s\n" % pem)
 
+    # Test disabled: OPENSSL_VERSION* not available in Python 2.6
     def test_algorithms(self):
+        if test_support.verbose:
+            sys.stdout.write("test_algorithms disabled, "
+                             "as it fails on some old OpenSSL versions")
+        return
         # Issue #8484: all algorithms should be available when verifying a
         # certificate.
         # NOTE: https://sha256.tbs-internet.com is another possible test host