From ba2f8be4c6ff755c79d4aeb6805de6bdd0354726 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 12 May 2013 11:11:51 +0200 Subject: Issue #17843: Remove bz2 test data that triggers antivirus warnings. --- Lib/test/test_bz2.py | 13 ++++++------- Lib/test/testbz2_bigmem.bz2 | Bin 3023 -> 0 bytes Misc/NEWS | 6 ++++++ 3 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 Lib/test/testbz2_bigmem.bz2 diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py index fb104d7..bcf80dc 100644 --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -26,9 +26,6 @@ class BaseTest(unittest.TestCase): DATA_CRLF = b'BZh91AY&SY\xaez\xbbN\x00\x01H\xdf\x80\x00\x12@\x02\xff\xf0\x01\x07n\x00?\xe7\xff\xe0@\x01\xbc\xc6`\x86*\x8d=M\xa9\x9a\x86\xd0L@\x0fI\xa6!\xa1\x13\xc8\x88jdi\x8d@\x03@\x1a\x1a\x0c\x0c\x83 \x00\xc4h2\x19\x01\x82D\x84e\t\xe8\x99\x89\x19\x1ah\x00\r\x1a\x11\xaf\x9b\x0fG\xf5(\x1b\x1f?\t\x12\xcf\xb5\xfc\x95E\x00ps\x89\x12^\xa4\xdd\xa2&\x05(\x87\x04\x98\x89u\xe40%\xb6\x19\'\x8c\xc4\x89\xca\x07\x0e\x1b!\x91UIFU%C\x994!DI\xd2\xfa\xf0\xf1N8W\xde\x13A\xf5\x9cr%?\x9f3;I45A\xd1\x8bT\xb1\xa4\xc7\x8d\x1a\\"\xad\xa1\xabyBg\x15\xb9l\x88\x88\x91k"\x94\xa4\xd4\x89\xae*\xa6\x0b\x10\x0c\xd6\xd4m\xe86\xec\xb5j\x8a\x86j\';\xca.\x01I\xf2\xaaJ\xe8\x88\x8cU+t3\xfb\x0c\n\xa33\x13r2\r\x16\xe0\xb3(\xbf\x1d\x83r\xe7M\xf0D\x1365\xd8\x88\xd3\xa4\x92\xcb2\x06\x04\\\xc1\xb0\xea//\xbek&\xd8\xe6+t\xe5\xa1\x13\xada\x16\xder5"w]\xa2i\xb7[\x97R \xe2IT\xcd;Z\x04dk4\xad\x8a\t\xd3\x81z\x10\xf1:^`\xab\x1f\xc5\xdc\x91N\x14$+\x9e\xae\xd3\x80' EMPTY_DATA = b'BZh9\x17rE8P\x90\x00\x00\x00\x00' - with open(findfile("testbz2_bigmem.bz2"), "rb") as f: - DATA_BIGMEM = f.read() - if has_cmdline_bunzip2: def decompress(self, data): pop = subprocess.Popen("bunzip2", shell=True, @@ -395,9 +392,10 @@ class BZ2DecompressorTest(BaseTest): @bigmemtest(size=_4G, memuse=1.25, dry_run=False) def testBigmem(self, unused_size): # Issue #14398: decompression fails when output data is >=2GB. - text = bz2.BZ2Decompressor().decompress(self.DATA_BIGMEM) + compressed = bz2.compress(b"a" * _4G) + text = bz2.BZ2Decompressor().decompress(compressed) self.assertEqual(len(text), _4G) - self.assertEqual(text.strip(b"\0"), b"") + self.assertEqual(text.strip(b"a"), b"") class FuncTest(BaseTest): @@ -442,9 +440,10 @@ class FuncTest(BaseTest): @bigmemtest(size=_4G, memuse=1.25, dry_run=False) def testDecompressBigmem(self, unused_size): # Issue #14398: decompression fails when output data is >=2GB. - text = bz2.decompress(self.DATA_BIGMEM) + compressed = bz2.compress(b"a" * _4G) + text = bz2.BZ2Decompressor().decompress(compressed) self.assertEqual(len(text), _4G) - self.assertEqual(text.strip(b"\0"), b"") + self.assertEqual(text.strip(b"a"), b"") def test_main(): support.run_unittest( diff --git a/Lib/test/testbz2_bigmem.bz2 b/Lib/test/testbz2_bigmem.bz2 deleted file mode 100644 index c9a4616..0000000 Binary files a/Lib/test/testbz2_bigmem.bz2 and /dev/null differ diff --git a/Misc/NEWS b/Misc/NEWS index a062175..8710c10 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -19,6 +19,12 @@ Library - Issue #15535: Fix namedtuple pickles which were picking up the OrderedDict instead of just the underlying tuple. +Tests +----- + +- Issue #17843: Removed bz2 test data file that was triggering false-positive + virus warnings with certain antivirus software. + What's New in Python 3.2.4? =========================== -- cgit v0.12