From: Martin Panter <vadmium>
Date: Mon, 7 Sep 2015 02:57:47 +0000 (+0000)
Subject: Issue #25004: Handle out-of-disk-space error in LargeMmapTests
X-Git-Tag: v3.5.1rc1~427^2~5^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8d58d1f022b41e3da80ccca7bf3586e2898874a;p=thirdparty%2FPython%2Fcpython.git

Issue #25004: Handle out-of-disk-space error in LargeMmapTests

Patch from John Beck.
---

diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
index 4d23f1689079..ad93a5938342 100644
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -727,7 +727,10 @@ class LargeMmapTests(unittest.TestCase):
             f.write(tail)
             f.flush()
         except (OSError, OverflowError):
-            f.close()
+            try:
+                f.close()
+            except (OSError, OverflowError):
+                pass
             raise unittest.SkipTest("filesystem does not have largefile support")
         return f
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 435cd1215890..88e55e022f4b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -100,6 +100,7 @@ Mike Bayer
 Samuel L. Bayer
 Donald Beaudry
 David Beazley
+John Beck
 Neal Becker
 Robin Becker
 Torsten Becker