From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 31 Oct 2010 13:15:24 +0000 (+0000)
Subject: Merged revisions 85935-85936 via svnmerge from
X-Git-Tag: v2.7.1rc1~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d75957d91167bb4363a9db7d0d923376a73f678;p=thirdparty%2FPython%2Fcpython.git

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
........
---

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index e1d3f7f7e341..92a3d11cea2c 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