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 bf1e63913953087fe7f82dd6b2a0aa5b5a7d3545..d639dd76631fdfe23ee730a0e340f369aa8e0616 100644 (file)
--- 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 dac91909bdcfc1d2a96f52a1a09808b7c250d88f..d8dc4d6e8b922f7a0c48eb158e9cd93a304ec9b4 100644 (file)
--- 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