diff options
author | Nadeem Vawda <nadeem.vawda@gmail.com> | 2012-02-23 11:36:25 (GMT) |
---|---|---|
committer | Nadeem Vawda <nadeem.vawda@gmail.com> | 2012-02-23 11:36:25 (GMT) |
commit | b063a48406f70a1c9a9debed593d350f30c0a47b (patch) | |
tree | 0b9524cda554ad5fad1a1ea7219ebb8d40589e15 | |
parent | b429d3b09c1f57a42d0cc218a7235383091ce317 (diff) | |
download | cpython-b063a48406f70a1c9a9debed593d350f30c0a47b.zip cpython-b063a48406f70a1c9a9debed593d350f30c0a47b.tar.gz cpython-b063a48406f70a1c9a9debed593d350f30c0a47b.tar.bz2 |
Issue #13873: Fix crash in test_zlib on bigmem buildbot.
-rw-r--r-- | Lib/test/test_zlib.py | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py index c361eac..486b37c 100644 --- a/Lib/test/test_zlib.py +++ b/Lib/test/test_zlib.py @@ -7,11 +7,6 @@ from test.support import bigmemtest, _1G, _4G zlib = support.import_module('zlib') -try: - import mmap -except ImportError: - mmap = None - class VersionTestCase(unittest.TestCase): @@ -77,24 +72,11 @@ class ChecksumTestCase(unittest.TestCase): # Issue #10276 - check that inputs >=4GB are handled correctly. class ChecksumBigBufferTestCase(unittest.TestCase): - def setUp(self): - with open(support.TESTFN, "wb+") as f: - f.seek(_4G) - f.write(b"asdf") - f.flush() - self.mapping = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ) - - def tearDown(self): - self.mapping.close() - support.unlink(support.TESTFN) - - @unittest.skipUnless(mmap, "mmap() is not available.") - @unittest.skipUnless(sys.maxsize > _4G, "Can't run on a 32-bit system.") - @unittest.skipUnless(support.is_resource_enabled("largefile"), - "May use lots of disk space.") - def test_big_buffer(self): - self.assertEqual(zlib.crc32(self.mapping), 3058686908) - self.assertEqual(zlib.adler32(self.mapping), 82837919) + @bigmemtest(size=_4G + 4, memuse=1) + def test_big_buffer(self,size): + data = b"nyan" * (_1G + 1) + self.assertEqual(zlib.crc32(data), 1044521549) + self.assertEqual(zlib.adler32(data), 2256789997) class ExceptionTestCase(unittest.TestCase): |