diff -r a2a4b9ff79bd lib-python/2.7/test/test_argparse.py --- a/lib-python/2.7/test/test_argparse.py Fri Mar 07 13:57:28 2014 -0500 +++ b/lib-python/2.7/test/test_argparse.py Wed Apr 02 01:09:43 2014 +0300 @@ -10,6 +10,7 @@ import tempfile import unittest import argparse +import gc from StringIO import StringIO @@ -47,7 +48,11 @@ def tearDown(self): os.chdir(self.old_dir) - shutil.rmtree(self.temp_dir, True) + gc.collect() + for root, dirs, files in os.walk(self.temp_dir, topdown=False): + for name in files: + os.chmod(os.path.join(self.temp_dir, name), stat.S_IWRITE) + shutil.rmtree(self.temp_dir, True) def create_readonly_file(self, filename): file_path = os.path.join(self.temp_dir, filename) diff -r a2a4b9ff79bd lib-python/2.7/test/test_file.py --- a/lib-python/2.7/test/test_file.py Fri Mar 07 13:57:28 2014 -0500 +++ b/lib-python/2.7/test/test_file.py Wed Apr 02 01:09:43 2014 +0300 @@ -301,6 +301,7 @@ self.fail("readlines() after next() with empty buffer " "failed. Got %r, expected %r" % (line, testline)) # Reading after iteration hit EOF shouldn't hurt either + f.close() f = self.open(TESTFN, 'rb') try: for line in f: diff -r a2a4b9ff79bd lib-python/2.7/test/test_httpservers.py --- a/lib-python/2.7/test/test_httpservers.py Fri Mar 07 13:57:28 2014 -0500 +++ b/lib-python/2.7/test/test_httpservers.py Wed Apr 02 01:09:43 2014 +0300 @@ -335,6 +335,7 @@ response = self.request(self.tempdir_name + '/') self.check_status_and_reason(response, 404) os.chmod(self.tempdir, 0755) + f.close() def test_head(self): response = self.request(