summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2015-02-05 06:20:13 (GMT)
committerNed Deily <nad@acm.org>2015-02-05 06:20:13 (GMT)
commit05784a706e294f51ca69bfaa89d0a6b92f48882a (patch)
tree919a4147ab653fdc490c476fa7d1fd7186630adf
parentff0fdef6d0506fd21605dad7eef638df7cbfd5bd (diff)
downloadcpython-05784a706e294f51ca69bfaa89d0a6b92f48882a.zip
cpython-05784a706e294f51ca69bfaa89d0a6b92f48882a.tar.gz
cpython-05784a706e294f51ca69bfaa89d0a6b92f48882a.tar.bz2
Issue #23345: Prevent test_ssl failures with large OpenSSL patch level
values (like 0.9.8zc).
-rw-r--r--Lib/test/test_ssl.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 0a7b905..dc82475 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -292,7 +292,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 6d58e8b..663cc53 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -340,6 +340,9 @@ Tests
- 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).
+
Build
-----