mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-21 22:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #23345: merge from 3.4

Browse source
This commit is contained in:
Ned Deily 2015-02-05 17:24:00 +11:00
commit 7aa4428835
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_ssl.py
View file

@ -306,7 +306,7 @@ class BasicSocketTests(unittest.TestCase):
self.assertGreaterEqual(fix, 0) self.assertGreaterEqual(fix, 0)
self.assertLess(fix, 256) self.assertLess(fix, 256)
self.assertGreaterEqual(patch, 0) self.assertGreaterEqual(patch, 0)
self.assertLessEqual(patch, 26) self.assertLessEqual(patch, 63)
self.assertGreaterEqual(status, 0) self.assertGreaterEqual(status, 0)
self.assertLessEqual(status, 15) self.assertLessEqual(status, 15)
# Version string as returned by {Open,Libre}SSL, the format might change # Version string as returned by {Open,Libre}SSL, the format might change

3
Misc/NEWS
View file

@ -1727,6 +1727,9 @@ Tests
- Issue #23211: Workaround test_logging failure on some OS X 10.6 systems. - 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 Tools/Demos
----------- -----------