From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Sun, 8 Jul 2012 10:08:45 +0000 (+0200)
Subject: Issue #11022 and #15287: correctly remove the TESTFN file in test_builtin.
X-Git-Tag: v3.3.0b2~281^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f4ce635ee70a4dbf2179ac2815bce4dac714165;p=thirdparty%2FPython%2Fcpython.git

Issue #11022 and #15287: correctly remove the TESTFN file in test_builtin.
---

diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index d0d17c76dfd9..c32992cc898e 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -960,7 +960,7 @@ class BuiltinTest(unittest.TestCase):
             self.assertEqual(fp.read(1000), 'YYY'*100)
         finally:
             fp.close()
-        unlink(TESTFN)
+            unlink(TESTFN)
 
     def test_open_default_encoding(self):
         old_environ = dict(os.environ)
@@ -979,6 +979,7 @@ class BuiltinTest(unittest.TestCase):
                 self.assertEqual(fp.encoding, current_locale_encoding)
             finally:
                 fp.close()
+                unlink(TESTFN)
         finally:
             os.environ.clear()
             os.environ.update(old_environ)