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

diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
index 2ea10a1dcc1a9ab70a010b1fda717e5a94736567..c6bdda10e4acd38d13967529b4c7054c6dc2f01f 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 3601cb960acb884246fc6b0ca1b9a11678c2d616..6490360a6baa5ecd4de25968c46a5a8e55234173 100644 (file)
--- 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?
 ===========================