From: Ned Deily <nad@acm.org>
Date: Thu, 5 Feb 2015 06:19:11 +0000 (+1100)
Subject: Issue #23345: Prevent test_ssl failures with large OpenSSL patch level
X-Git-Tag: v2.7.10rc1~186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa11978f1b14ca5dbbf83c3e0152d4bfa029bf35;p=thirdparty%2FPython%2Fcpython.git

Issue #23345: Prevent test_ssl failures with large OpenSSL patch level
values (like 0.9.8zc).
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 6c342d8fdb39..e9e80ee9ced3 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -275,7 +275,7 @@ class BasicSocketTests(unittest.TestCase):
         self.assertGreaterEqual(fix, 0)
         self.assertLess(fix, 256)
         self.assertGreaterEqual(patch, 0)
-        self.assertLessEqual(patch, 26)
+        self.assertLessEqual(patch, 63)
         self.assertGreaterEqual(status, 0)
         self.assertLessEqual(status, 15)
         # Version string as returned by {Open,Libre}SSL, the format might change
diff --git a/Misc/NEWS b/Misc/NEWS
index 494a38635420..433ce0d2d4e2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -92,6 +92,9 @@ Tools/Demos
 - Issue #18905: "pydoc -p 0" now outputs actually used port.  Based on patch by
   Wieland Hoffmann.
 
+- Issue #23345: Prevent test_ssl failures with large OpenSSL patch level
+  values (like 0.9.8zc).
+
 Tests
 -----