From 33c5813a5903f1843c3066cf257f3a623a1b88ff Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 11 May 2010 23:33:53 +0000 Subject: [PATCH] Merged revisions 81094 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81094 | antoine.pitrou | 2010-05-12 01:32:31 +0200 (mer., 12 mai 2010) | 6 lines Issue #8672: Add a zlib test ensuring that an incomplete stream can be handled by a decompressor object without errors (it returns incomplete uncompressed data). ........ --- Lib/test/test_zlib.py | 13 +++++++++++++ Misc/NEWS | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py index 9d17c9330b1..9137f8aaeb3 100644 --- a/Lib/test/test_zlib.py +++ b/Lib/test/test_zlib.py @@ -360,6 +360,19 @@ class CompressObjectTestCase(BaseCompressTestCase, unittest.TestCase): dco = zlib.decompressobj() self.assertEqual(dco.flush(), "") # Returns nothing + def test_decompress_incomplete_stream(self): + # This is 'foo', deflated + x = 'x\x9cK\xcb\xcf\x07\x00\x02\x82\x01E' + # For the record + self.assertEqual(zlib.decompress(x), 'foo') + self.assertRaises(zlib.error, zlib.decompress, x[:-5]) + # Omitting the stream end works with decompressor objects + # (see issue #8672). + dco = zlib.decompressobj() + y = dco.decompress(x[:-5]) + y += dco.flush() + self.assertEqual(y, 'foo') + if hasattr(zlib.compressobj(), "copy"): def test_compresscopy(self): # Test copying a compression object diff --git a/Misc/NEWS b/Misc/NEWS index 9e4e10cd413..46e573704e5 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -186,6 +186,10 @@ Build Tests ----- +- Issue #8672: Add a zlib test ensuring that an incomplete stream can be + handled by a decompressor object without errors (it returns incomplete + uncompressed data). + - Issue #8629: Disable some test_ssl tests, since they give different results with OpenSSL 1.0.0 and higher.