[Python-checkins] r79850 - in python/branches/release26-maint: Lib/test/test_zlib.py Misc/NEWS

[antoine.pitrou]

Author: antoine.pitrou
Date: Tue Apr  6 19:24:02 2010
New Revision: 79850

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


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_zlib.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/test/test_zlib.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_zlib.py	(original)
+++ python/branches/release26-maint/Lib/test/test_zlib.py	Tue Apr  6 19:24:02 2010
@@ -81,7 +81,7 @@
 
     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

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Tue Apr  6 19:24:02 2010
@@ -72,6 +72,11 @@
   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?
 ===========================