Merged revisions 88460,88464,88466,88486,88511,88652 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88460 | antoine.pitrou | 2011-02-21 19:03:13 +0100 (lun., 21 févr. 2011) | 4 lines
Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers
larger than 4GB. Patch by Nadeem Vawda.
........
r88464 | antoine.pitrou | 2011-02-21 20:05:08 +0100 (lun., 21 févr. 2011) | 3 lines
Fix issues on 32-bit systems introduced by r88460
........
r88466 | antoine.pitrou | 2011-02-21 20:28:40 +0100 (lun., 21 févr. 2011) | 3 lines
Fix compile error under MSVC introduced by r88460.
........
r88486 | antoine.pitrou | 2011-02-22 00:41:12 +0100 (mar., 22 févr. 2011) | 5 lines
Issue #4681: Allow mmap() to work on file sizes and offsets larger than
4GB, even on 32-bit builds. Initial patch by Ross Lagerwall, adapted for
32-bit Windows.
........
r88511 | antoine.pitrou | 2011-02-22 22:42:56 +0100 (mar., 22 févr. 2011) | 4 lines
Issue #11277: finally fix Snow Leopard crash following r88460.
(probably an OS-related issue with mmap)
........
r88652 | antoine.pitrou | 2011-02-26 16:58:05 +0100 (sam., 26 févr. 2011) | 4 lines
Issue #9931: Fix hangs in GUI tests under Windows in certain conditions.
Patch by Hirokazu Yamamoto.
........
diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
index 4b16efb..b27049c 100644
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -2,10 +2,16 @@
from test import support
import binascii
import random
-from test.support import precisionbigmemtest, _1G
+import sys
+from test.support import precisionbigmemtest, _1G, _4G
zlib = support.import_module('zlib')
+try:
+ import mmap
+except ImportError:
+ mmap = None
+
class ChecksumTestCase(unittest.TestCase):
# checksum test cases
@@ -57,6 +63,28 @@
self.assertEqual(binascii.crc32(b'spam'), zlib.crc32(b'spam'))
+# 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")
+ with open(support.TESTFN, "rb") as f:
+ 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)
+
class ExceptionTestCase(unittest.TestCase):
# make sure we generate some expected errors
@@ -567,6 +595,7 @@
def test_main():
support.run_unittest(
ChecksumTestCase,
+ ChecksumBigBufferTestCase,
ExceptionTestCase,
CompressTestCase,
CompressObjectTestCase