summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-06 17:25:56 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-06 17:25:56 (GMT)
commite96bf094755430684239fb8b61581053f069f73e (patch)
treef9d2147ac75d3a89e008301ce664655d030463dd
parent5775b79c35174c509ed4585f78da39430743e922 (diff)
downloadcpython-e96bf094755430684239fb8b61581053f069f73e.zip
cpython-e96bf094755430684239fb8b61581053f069f73e.tar.gz
cpython-e96bf094755430684239fb8b61581053f069f73e.tar.bz2
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. ........ ................
-rw-r--r--Lib/test/test_zlib.py2
-rw-r--r--Misc/NEWS5
2 files changed, 6 insertions, 1 deletions
diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
index 2ea10a1..c6bdda1 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 3601cb9..6490360 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?
===========================