summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-10-31 13:15:20 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-10-31 13:15:20 (GMT)
commita4f1afa640dbe031f9b449a74fafd29d7d0f6ecf (patch)
tree67a93b1204b2a7baf45fe3b822ee2ab8b19cd934
parente305425b86a5896cd3afce0859f4762b1fe62917 (diff)
downloadcpython-a4f1afa640dbe031f9b449a74fafd29d7d0f6ecf.zip
cpython-a4f1afa640dbe031f9b449a74fafd29d7d0f6ecf.tar.gz
cpython-a4f1afa640dbe031f9b449a74fafd29d7d0f6ecf.tar.bz2
Merged revisions 85935-85936 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85935 | antoine.pitrou | 2010-10-29 21:34:45 +0200 (ven., 29 oct. 2010) | 4 lines Make a GC run before trying to clean up files left over by the latest test run. ........ r85936 | antoine.pitrou | 2010-10-29 21:36:37 +0200 (ven., 29 oct. 2010) | 3 lines Fix typo ........
-rwxr-xr-xLib/test/regrtest.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index cac3c8c..5b1f4e2 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -688,6 +688,10 @@ def runtest_inner(test, generate, verbose, quiet, test_times,
def cleanup_test_droppings(testname, verbose):
import shutil
import stat
+ import gc
+
+ # First kill any dangling references to open files etc.
+ gc.collect()
# Try to clean up junk commonly left behind. While tests shouldn't leave
# any files or directories behind, when a test fails that can be tedious