summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-02-27 00:01:44 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-02-27 00:01:44 (GMT)
commitf12b4475cc44c612e5d461cad7d7b511bf34d6dc (patch)
treef0ffb67def8c7030912cc5cf2796736e7830c8d0
parente965d97ed1adac6a9a5cf69f04770249589756c7 (diff)
parent05a4dd83af7c9b7feae88abc6b8be21924e8a4a0 (diff)
downloadcpython-f12b4475cc44c612e5d461cad7d7b511bf34d6dc.zip
cpython-f12b4475cc44c612e5d461cad7d7b511bf34d6dc.tar.gz
cpython-f12b4475cc44c612e5d461cad7d7b511bf34d6dc.tar.bz2
Merge
-rw-r--r--Lib/test/test_zlib.py23
1 files changed, 5 insertions, 18 deletions
diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
index dffa2ca..60081e2 100644
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -66,24 +66,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, dry_run=False)
+ 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):