diff options
| author | Ned Deily <nad@acm.org> | 2015-02-05 06:24:00 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2015-02-05 06:24:00 (GMT) |
| commit | 7aa4428835d82d05e1812d15d7b6fd65c4fafc77 (patch) | |
| tree | 33dbbbb6e2db3c8364cbbc980c8aa3fe14a95936 | |
| parent | da3c64c82602261fd14a5ecd3b05c290a71c8318 (diff) | |
| parent | 05784a706e294f51ca69bfaa89d0a6b92f48882a (diff) | |
| download | cpython-7aa4428835d82d05e1812d15d7b6fd65c4fafc77.zip cpython-7aa4428835d82d05e1812d15d7b6fd65c4fafc77.tar.gz cpython-7aa4428835d82d05e1812d15d7b6fd65c4fafc77.tar.bz2 | |
Issue #23345: merge from 3.4
| -rw-r--r-- | Lib/test/test_ssl.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 879d6fd..2f2e739 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -306,7 +306,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 @@ -1727,6 +1727,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). + Tools/Demos ----------- |