summaryrefslogtreecommitdiff
path: root/Lib
diff options
context:
space:
mode:
authorNadeem Vawda <nadeem.vawda@gmail.com>2011-05-07 14:12:12 +0200
committerNadeem Vawda <nadeem.vawda@gmail.com>2011-05-07 14:12:12 +0200
commitd683b2561a9fb4a9e049a98a3072bd9b957e57c5 (patch)
tree84c849e92f694e751eb6a518965ca96b135f15ba /Lib
parent356a3183601aed95b3a13334e0da99566b83bcf3 (diff)
downloadcpython-d683b2561a9fb4a9e049a98a3072bd9b957e57c5.tar.gz
Issue #11277: Fix tests - crash will not trigger if the file is closed and reopened.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_mmap.py26
1 files changed, 12 insertions, 14 deletions
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
index 463b14c64e..a87e6ae721 100644
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -645,21 +645,21 @@ class LargeMmapTests(unittest.TestCase):
def tearDown(self):
unlink(TESTFN)
- def _create_test_file(self, num_zeroes, tail):
+ def _make_test_file(self, num_zeroes, tail):
if sys.platform[:3] == 'win' or sys.platform == 'darwin':
requires('largefile',
'test requires %s bytes and a long time to run' % str(0x180000000))
- with open(TESTFN, 'wb') as f:
- try:
- f.seek(num_zeroes)
- f.write(tail)
- f.flush()
- except (IOError, OverflowError):
- raise unittest.SkipTest("filesystem does not have largefile support")
+ f = open(TESTFN, 'w+b')
+ try:
+ f.seek(num_zeroes)
+ f.write(tail)
+ f.flush()
+ except (IOError, OverflowError):
+ raise unittest.SkipTest("filesystem does not have largefile support")
+ return f
def test_large_offset(self):
- self._create_test_file(0x14FFFFFFF, b" ")
- with open(TESTFN, 'rb') as f:
+ with self._make_test_file(0x14FFFFFFF, b" ") as f:
m = mmap.mmap(f.fileno(), 0, offset=0x140000000, access=mmap.ACCESS_READ)
try:
self.assertEqual(m[0xFFFFFFF], b" ")
@@ -667,8 +667,7 @@ class LargeMmapTests(unittest.TestCase):
m.close()
def test_large_filesize(self):
- self._create_test_file(0x17FFFFFFF, b" ")
- with open(TESTFN, 'rb') as f:
+ with self._make_test_file(0x17FFFFFFF, b" ") as f:
m = mmap.mmap(f.fileno(), 0x10000, access=mmap.ACCESS_READ)
try:
self.assertEqual(m.size(), 0x180000000)
@@ -681,8 +680,7 @@ class LargeMmapTests(unittest.TestCase):
tail = b' DEARdear '
start = boundary - len(tail) // 2
end = start + len(tail)
- self._create_test_file(start, tail)
- with open(TESTFN, 'rb') as f:
+ with self._make_test_file(start, tail) as f:
m = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ)
try:
self.assertEqual(m[start:end], tail)