From 0ca5286ad9ec47cbe0502d421194f47fd71ab181 Mon Sep 17 00:00:00 2001 From: John Dickinson Date: Mon, 4 Oct 2010 16:55:08 -0500 Subject: [PATCH] improved compressing file reader test --- test/unit/common/test_compressing_file_reader.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/unit/common/test_compressing_file_reader.py b/test/unit/common/test_compressing_file_reader.py index b3e340a6d5..0da4d5dd65 100644 --- a/test/unit/common/test_compressing_file_reader.py +++ b/test/unit/common/test_compressing_file_reader.py @@ -17,7 +17,6 @@ import unittest import cStringIO -import zlib from swift.common.compressing_file_reader import CompressingFileReader @@ -29,6 +28,6 @@ class TestCompressingFileReader(unittest.TestCase): expected = '\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff'\ '\xcaO\xca\xe2JI,I\x04\x00\x00\x00\xff\xff' x = CompressingFileReader(s) - self.assertEquals(x.read(), expected) - d = zlib.decompressobj(16 + zlib.MAX_WBITS) - self.assertEquals(plain, d.decompress(expected)) + compressed = ''.join(iter(lambda: x.read(), '')) + self.assertEquals(compressed, expected) + self.assertEquals(x.read(), '')