diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-10-01 03:11:04 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-10-01 03:11:04 (GMT) |
| commit | 55c9239af613682ec141bf6b2c4eb77497943088 (patch) | |
| tree | ccc9268a47f8b36c879bf4f1f336b4a8f1118438 /Lib | |
| parent | ef223a19f76101a914ccff8b4690d9e4717e109e (diff) | |
| parent | 38317d3318e05832a864d413aa744a48a8975dce (diff) | |
| download | cpython-55c9239af613682ec141bf6b2c4eb77497943088.zip cpython-55c9239af613682ec141bf6b2c4eb77497943088.tar.gz cpython-55c9239af613682ec141bf6b2c4eb77497943088.tar.bz2 | |
Issue #28275: Merge bz2 fix from 3.5 into 3.6
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_bz2.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_lzma.py | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py index 450ab2e..46ad2c4 100644 --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -821,6 +821,12 @@ class BZ2DecompressorTest(BaseTest): out.append(bzd.decompress(self.DATA[300:])) self.assertEqual(b''.join(out), self.TEXT) + def test_failure(self): + bzd = BZ2Decompressor() + self.assertRaises(Exception, bzd.decompress, self.BAD_DATA * 30) + # Previously, a second call could crash due to internal inconsistency + self.assertRaises(Exception, bzd.decompress, self.BAD_DATA * 30) + class CompressDecompressTest(BaseTest): def testCompress(self): data = bz2.compress(self.TEXT) diff --git a/Lib/test/test_lzma.py b/Lib/test/test_lzma.py index 77ca022..228db66 100644 --- a/Lib/test/test_lzma.py +++ b/Lib/test/test_lzma.py @@ -249,11 +249,9 @@ class CompressorDecompressorTestCase(unittest.TestCase): def test_decompressor_bug_28275(self): # Test coverage for Issue 28275 lzd = LZMADecompressor() - for i in range(2): - try: - lzd.decompress(COMPRESSED_RAW_1) - except LZMAError: - pass + self.assertRaises(LZMAError, lzd.decompress, COMPRESSED_RAW_1) + # Previously, a second call could crash due to internal inconsistency + self.assertRaises(LZMAError, lzd.decompress, COMPRESSED_RAW_1) # Test that LZMACompressor->LZMADecompressor preserves the input data. |