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.
........

diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
index adb87ff0faf045b75b3ed41c38ac62f29af630c8..d1e17962f96ba8d99507616bfe32aba332001850 100644 (file)
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -81,7 +81,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 92bef1cb2891ffad791d9991962cd6aab9460cce..3595306d16ce28fa811ebf3c79ae181d6430957f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -72,6 +72,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 2.6.5?
 ===========================