[Python-checkins] cpython (2.7): Issue #11277: Fix tests - crash will not trigger if the file is closed and

[nadeem.vawda]

http://hg.python.org/cpython/rev/9b9f0de19684
changeset:   69894:9b9f0de19684
branch:      2.7
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sat May 07 14:12:12 2011 +0200
summary:
  Issue #11277: Fix tests - crash will not trigger if the file is closed and reopened.

files:
  Lib/test/test_mmap.py |  26 ++++++++++++--------------
  1 files changed, 12 insertions(+), 14 deletions(-)


diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -645,21 +645,21 @@
     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 @@
                 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 @@
         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)

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