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
........

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index ad5864726596019be3df63dca532eb8b2141475e..12373d19eb6290a36d385da25eee3d5afba14a3b 100644 (file)
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -190,7 +190,12 @@ class NetworkedTests(unittest.TestCase):
         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