From 1222669b440e163885be8661cf81c3d46a73b337 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 6 May 2010 13:49:10 +0000
Subject: [PATCH] Issue #8629: Disable some test_ssl tests, since they give
 different results with OpenSSL 1.0.0 and higher.

---
 Lib/test/test_ssl.py | 18 +++++++++++++-----
 Misc/NEWS            |  3 +++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index db640c135ac..6d49994bb53 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -716,7 +716,7 @@ else:
                 raise
         else:
             if not expect_success:
-                self.fail(
+                raise AssertionError(
                     "Client protocol %s succeeded with server protocol %s!"
                     % (ssl.get_protocol_name(client_protocol),
                        ssl.get_protocol_name(server_protocol)))
@@ -832,7 +832,9 @@ else:
         def test_protocol_sslv2(self):
             """Connecting to an SSLv2 server with various client options"""
             if test_support.verbose:
-                sys.stdout.write("\n")
+                sys.stdout.write("\ntest_protocol_sslv2 disabled, "
+                                 "as it fails on OpenSSL 1.0.0+")
+            return
             try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True)
             try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True, ssl.CERT_OPTIONAL)
             try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True, ssl.CERT_REQUIRED)
@@ -843,7 +845,9 @@ else:
         def test_protocol_sslv23(self):
             """Connecting to an SSLv23 server with various client options"""
             if test_support.verbose:
-                sys.stdout.write("\n")
+                sys.stdout.write("\ntest_protocol_sslv23 disabled, "
+                                 "as it fails on OpenSSL 1.0.0+")
+            return
             try:
                 try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv2, True)
             except (ssl.SSLError, socket.error), x:
@@ -867,7 +871,9 @@ else:
         def test_protocol_sslv3(self):
             """Connecting to an SSLv3 server with various client options"""
             if test_support.verbose:
-                sys.stdout.write("\n")
+                sys.stdout.write("\ntest_protocol_sslv3 disabled, "
+                                 "as it fails on OpenSSL 1.0.0+")
+            return
             try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True)
             try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True, ssl.CERT_OPTIONAL)
             try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED)
@@ -878,7 +884,9 @@ else:
         def test_protocol_tlsv1(self):
             """Connecting to a TLSv1 server with various client options"""
             if test_support.verbose:
-                sys.stdout.write("\n")
+                sys.stdout.write("\ntest_protocol_tlsv1 disabled, "
+                                 "as it fails on OpenSSL 1.0.0+")
+            return
             try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, True)
             try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, True, ssl.CERT_OPTIONAL)
             try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, True, ssl.CERT_REQUIRED)
diff --git a/Misc/NEWS b/Misc/NEWS
index 85e40d88089..7bafbbe5b42 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -164,6 +164,9 @@ Build
 Tests
 -----
 
+- Issue #8629: Disable some test_ssl tests, since they give different
+  results with OpenSSL 1.0.0 and higher.
+
 - Issue #8576: Remove use of find_unused_port() in test_smtplib and
   test_multiprocessing.  Patch by Paul Moore.