summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2015-02-05 17:20:13 +1100
committerNed Deily <nad@acm.org>2015-02-05 17:20:13 +1100
commit83de094385e8d201bfe6203d8af816f5c752f3dd (patch)
treeb9107fd549d31c2e89edb8f2ee73b82862112fb3
parentef6a8fd47726cf3deaccf17ef6744f5b1b75dd74 (diff)
downloadcpython-83de094385e8d201bfe6203d8af816f5c752f3dd.tar.gz
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 0a7b905073..dc82475a9d 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 6d58e8b865..663cc53a26 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
-----