From e96bf094755430684239fb8b61581053f069f73e Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 6 Apr 2010 17:25:56 +0000 Subject: [PATCH] Merged revisions 79849 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r79849 | antoine.pitrou | 2010-04-06 19:23:13 +0200 (mar., 06 avril 2010) | 9 lines 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. ........ ................ --- Lib/test/test_zlib.py | 2 +- Misc/NEWS | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py index 2ea10a1dcc1..c6bdda10e4a 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 3601cb960ac..6490360a6ba 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -51,6 +51,11 @@ Build variable anymore. It also forwards the LDFLAGS settings to the linker when building a shared library. +Tests +----- + +- Issue #8193: Fix test_zlib failure with zlib 1.2.4. + What's New in Python 3.1.2? ===========================