From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Thu, 5 Mar 2009 14:58:34 +0000 (+0000)
Subject: Merged revisions 70193 via svnmerge from
X-Git-Tag: v2.6.2c1~114
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2d36e409dbb6f27d4de9e788542e5d5aead9d8c;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 70193 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70193 | hirokazu.yamamoto | 2009-03-05 23:52:44 +0900 | 1 line

  mmap.resize for anonymous map is not working yet, so changed to real file mapping...
........
---

diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
index bed5d2bcaacb..31daa8df11d0 100644
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -535,9 +535,12 @@ class MmapTests(unittest.TestCase):
             m.close()
 
             # Should not crash (Issue 5385)
-            m = mmap.mmap(-1, 1000)
+            open(TESTFN, "wb").write("x"*10)
+            f = open(TESTFN, "r+b")
+            m = mmap.mmap(f.fileno(), 0)
+            f.close()
             try:
-                m.resize(0)
+                m.resize(0) # will raise WindowsError
             except:
                 pass
             try:
@@ -546,19 +549,6 @@ class MmapTests(unittest.TestCase):
                 pass
             m.close()
 
-            m1 = mmap.mmap(-1, 1000)
-            m2 = mmap.mmap(-1, 1000)
-            try:
-                m2.resize(5000)
-            except:
-                pass
-            try:
-                m2[:]
-            except:
-                pass
-            m2.close()
-            m1.close()
-
 
 def test_main():
     run_unittest(MmapTests)