[Python-checkins] cpython: Issue #13873: Fix crash in test_zlib on bigmem buildbot.

[nadeem.vawda]

http://hg.python.org/cpython/rev/f3f3bb45205b
changeset:   75190:f3f3bb45205b
parent:      75186:31784350f849
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Thu Feb 23 13:36:25 2012 +0200
summary:
  Issue #13873: Fix crash in test_zlib on bigmem buildbot.

files:
  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
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -7,11 +7,6 @@
 
 zlib = support.import_module('zlib')
 
-try:
-    import mmap
-except ImportError:
-    mmap = None
-
 
 class VersionTestCase(unittest.TestCase):
 
@@ -77,24 +72,11 @@
 # 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):

-- 
Repository URL: http://hg.python.org/cpython