summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-22 18:42:58 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-22 18:42:58 (GMT)
commitb7c656f2f59c54576b70fef2306a1cb75b833922 (patch)
tree855670b888f18b78b2ff860479c75fd6bd7cd55b /Lib
parent78ca466f7f7dcc2270332f45b97ba63f1939fc48 (diff)
downloadcpython-b7c656f2f59c54576b70fef2306a1cb75b833922.zip
cpython-b7c656f2f59c54576b70fef2306a1cb75b833922.tar.gz
cpython-b7c656f2f59c54576b70fef2306a1cb75b833922.tar.bz2
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 ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_ssl.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index ad58647..12373d1 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