diff options
author | Georg Brandl <georg@python.org> | 2013-05-12 09:57:26 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2013-05-12 09:57:26 (GMT) |
commit | b3bd624a55ea5bf3a0e77cfa9d987d82ed23652f (patch) | |
tree | 6f3eec34ee852fdb40cf731f2c422d4831fd2e15 /Lib/test | |
parent | 64949fa20e4845e92a1d42f581a47b559a9acd25 (diff) | |
download | cpython-b3bd624a55ea5bf3a0e77cfa9d987d82ed23652f.zip cpython-b3bd624a55ea5bf3a0e77cfa9d987d82ed23652f.tar.gz cpython-b3bd624a55ea5bf3a0e77cfa9d987d82ed23652f.tar.bz2 |
Back out patch for #1159051, which caused backwards compatibility problems.
Diffstat (limited to 'Lib/test')
-rw-r--r-- | Lib/test/test_bz2.py | 14 | ||||
-rwxr-xr-x[-rw-r--r--] | Lib/test/test_gzip.py | 14 | ||||
-rw-r--r-- | Lib/test/test_lzma.py | 14 |
3 files changed, 0 insertions, 42 deletions
diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py index df7e18c..912fac1 100644 --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -577,20 +577,6 @@ class BZ2FileTest(BaseTest): bz2f.seek(-150, 1) self.assertEqual(bz2f.read(), self.TEXT[500-150:]) - def test_read_truncated(self): - # Drop the eos_magic field (6 bytes) and CRC (4 bytes). - truncated = self.DATA[:-10] - with BZ2File(BytesIO(truncated)) as f: - self.assertRaises(EOFError, f.read) - with BZ2File(BytesIO(truncated)) as f: - self.assertEqual(f.read(len(self.TEXT)), self.TEXT) - self.assertRaises(EOFError, f.read, 1) - # Incomplete 4-byte file header, and block header of at least 146 bits. - for i in range(22): - with BZ2File(BytesIO(truncated[:i])) as f: - self.assertRaises(EOFError, f.read, 1) - - class BZ2CompressorTest(BaseTest): def testCompress(self): bz2c = BZ2Compressor() diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py index 37fe853..5eac921 100644..100755 --- a/Lib/test/test_gzip.py +++ b/Lib/test/test_gzip.py @@ -389,20 +389,6 @@ class TestGzip(BaseTest): datac = gzip.compress(data) self.assertEqual(gzip.decompress(datac), data) - def test_read_truncated(self): - data = data1*50 - # Drop the CRC (4 bytes) and file size (4 bytes). - truncated = gzip.compress(data)[:-8] - with gzip.GzipFile(fileobj=io.BytesIO(truncated)) as f: - self.assertRaises(EOFError, f.read) - with gzip.GzipFile(fileobj=io.BytesIO(truncated)) as f: - self.assertEqual(f.read(len(data)), data) - self.assertRaises(EOFError, f.read, 1) - # Incomplete 10-byte header. - for i in range(2, 10): - with gzip.GzipFile(fileobj=io.BytesIO(truncated[:i])) as f: - self.assertRaises(EOFError, f.read, 1) - def test_read_with_extra(self): # Gzip data with an extra field gzdata = (b'\x1f\x8b\x08\x04\xb2\x17cQ\x02\xff' diff --git a/Lib/test/test_lzma.py b/Lib/test/test_lzma.py index 20d8582..a13cf3b 100644 --- a/Lib/test/test_lzma.py +++ b/Lib/test/test_lzma.py @@ -669,20 +669,6 @@ class FileTestCase(unittest.TestCase): with LZMAFile(BytesIO(COMPRESSED_XZ[:128])) as f: self.assertRaises(EOFError, f.read) - def test_read_truncated(self): - # Drop stream footer: CRC (4 bytes), index size (4 bytes), - # flags (2 bytes) and magic number (2 bytes). - truncated = COMPRESSED_XZ[:-12] - with LZMAFile(BytesIO(truncated)) as f: - self.assertRaises(EOFError, f.read) - with LZMAFile(BytesIO(truncated)) as f: - self.assertEqual(f.read(len(INPUT)), INPUT) - self.assertRaises(EOFError, f.read, 1) - # Incomplete 12-byte header. - for i in range(12): - with LZMAFile(BytesIO(truncated[:i])) as f: - self.assertRaises(EOFError, f.read, 1) - def test_read_bad_args(self): f = LZMAFile(BytesIO(COMPRESSED_XZ)) f.close() |