summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-06 17:23:13 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-06 17:23:13 (GMT)
commit90ee4dfef4e2d945512ccdd3a4e0fc08115d7790 (patch)
treea7c352da159d36480239b8a933acee3ee91347ac
parent3318d29d2202f58b4011ec050f5e68a14feb6722 (diff)
downloadcpython-90ee4dfef4e2d945512ccdd3a4e0fc08115d7790.zip
cpython-90ee4dfef4e2d945512ccdd3a4e0fc08115d7790.tar.gz
cpython-90ee4dfef4e2d945512ccdd3a4e0fc08115d7790.tar.bz2
Merged revisions 79848 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r79848 | antoine.pitrou | 2010-04-06 19:21:09 +0200 (mar., 06 avril 2010) | 3 lines Issue #8193: Fix test_zlib failure with zlib 1.2.4. ........
-rw-r--r--Lib/test/test_zlib.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
index bf1e639..d639dd7 100644
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -85,7 +85,7 @@ class ExceptionTestCase(unittest.TestCase):
def test_baddecompressobj(self):
# verify failure on building decompress object with bad params
- self.assertRaises(ValueError, zlib.decompressobj, 0)
+ self.assertRaises(ValueError, zlib.decompressobj, -1)
def test_decompressobj_badflush(self):
# verify failure on calling decompressobj.flush with bad params
diff --git a/Misc/NEWS b/Misc/NEWS
index dac9190..d8dc4d6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1015,6 +1015,8 @@ Documentation
Tests
-----
+- Issue #8193: Fix test_zlib failure with zlib 1.2.4.
+
- Issue #8248: Add some tests for the bool type. Patch by Gregory Nofi.
- Issue #8263: Now regrtest.py will report a failure if it receives a