summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-10-31 13:15:24 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-10-31 13:15:24 (GMT)
commit0d75957d91167bb4363a9db7d0d923376a73f678 (patch)
tree33661fa063c638c1e6c24ad7bb320f47abd117f5
parent3917c092b954a967fac7324628b213afbbb32a8c (diff)
downloadcpython-0d75957d91167bb4363a9db7d0d923376a73f678.zip
cpython-0d75957d91167bb4363a9db7d0d923376a73f678.tar.gz
cpython-0d75957d91167bb4363a9db7d0d923376a73f678.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 e1d3f7f..92a3d11 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -923,6 +923,10 @@ def runtest_inner(test, verbose, quiet,
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