summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium>2015-09-07 02:57:47 (GMT)
committerMartin Panter <vadmium>2015-09-07 02:57:47 (GMT)
commite8d58d1f022b41e3da80ccca7bf3586e2898874a (patch)
treea2007e3f3a365d046fcc2fba52214d4752a333c8
parent7f02d6d0d946a724ea1f4f1ffb6680c881dbad33 (diff)
downloadcpython-e8d58d1f022b41e3da80ccca7bf3586e2898874a.zip
cpython-e8d58d1f022b41e3da80ccca7bf3586e2898874a.tar.gz
cpython-e8d58d1f022b41e3da80ccca7bf3586e2898874a.tar.bz2
Issue #25004: Handle out-of-disk-space error in LargeMmapTests
Patch from John Beck.
-rw-r--r--Lib/test/test_mmap.py5
-rw-r--r--Misc/ACKS1
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
index 4d23f16..ad93a59 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 435cd12..88e55e0 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