From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 26 Jan 2008 21:02:45 +0000 (+0000)
Subject: Always try to remove the test file even if close raises an exception
X-Git-Tag: v2.6a1~384
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a121508facdf571a128230a84b3d701c5970d3ff;p=python

Always try to remove the test file even if close raises an exception
---

diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py
index 16e360f1a8..09ac4d53ca 100644
--- a/Lib/test/test_resource.py
+++ b/Lib/test/test_resource.py
@@ -15,7 +15,6 @@ class ResourceTest(unittest.TestCase):
         self.assertRaises(TypeError, resource.setrlimit, 42, 42, 42)
 
     def test_fsize_ismax(self):
-
         try:
             (cur, max) = resource.getrlimit(resource.RLIMIT_FSIZE)
         except AttributeError:
@@ -63,10 +62,10 @@ class ResourceTest(unittest.TestCase):
                         resource.setrlimit(resource.RLIMIT_FSIZE, (cur, max))
                 finally:
                     f.close()
-                    os.unlink(test_support.TESTFN)
             finally:
                 if limit_set:
                     resource.setrlimit(resource.RLIMIT_FSIZE, (cur, max))
+                test_support.unlink(test_support.TESTFN)
 
     def test_fsize_toobig(self):
         # Be sure that setrlimit is checking for really large values