changeset:   94514:62b322b82f00
parent:      94509:a7ddddfe9e36
parent:      94513:52932cd7f003
user:        Ned Deily <nad@acm.org>
date:        Thu Feb 05 17:24:00 2015 +1100
files:       Lib/test/test_ssl.py Misc/NEWS
description:
Issue #23345: merge from 3.4


diff -r a7ddddfe9e36 -r 62b322b82f00 Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py	Wed Feb 04 22:00:56 2015 -0500
+++ b/Lib/test/test_ssl.py	Thu Feb 05 17:24:00 2015 +1100
@@ -306,7 +306,7 @@
         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 -r a7ddddfe9e36 -r 62b322b82f00 Misc/NEWS
--- a/Misc/NEWS	Wed Feb 04 22:00:56 2015 -0500
+++ b/Misc/NEWS	Thu Feb 05 17:24:00 2015 +1100
@@ -1727,6 +1727,9 @@
 
 - Issue #23211: Workaround test_logging failure on some OS X 10.6 systems.
 
+- Issue #23345: Prevent test_ssl failures with large OpenSSL patch level
+  values (like 0.9.8zc).
+
 Tools/Demos
 -----------