From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 22 Apr 2010 18:42:58 +0000 (+0000)
Subject: Merged revisions 80375 via svnmerge from
X-Git-Tag: v2.6.6rc1~415
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7c656f2f59c54576b70fef2306a1cb75b833922;p=python

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 ad58647265..12373d19eb 100644
--- 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