You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/05/22 06:02:18 UTC

svn commit: r1485054 - in /subversion/branches/1.8.x: ./ STATUS subversion/tests/cmdline/svntest/sandbox.py

Author: svn-role
Date: Wed May 22 04:02:17 2013
New Revision: 1485054

URL: http://svn.apache.org/r1485054
Log:
Merge r1483116 from trunk:

 * r1483116
   Retry removing test temporary directories when running as deferred deletes
   using a short delay.
   Justification:
     Without this patch running the svnserve-bdb tests on Windows leaves a lot
     of temporary directories behind, causing testruns to fail on ramdrives.
   Votes:
     +1: rhuijben, pburba, breser

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/tests/cmdline/svntest/sandbox.py

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1483116

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1485054&r1=1485053&r2=1485054&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed May 22 04:02:17 2013
@@ -143,15 +143,6 @@ Approved changes:
 # blocking issues.  If in doubt see this link for details:
 # http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
 
- * r1483116
-   Retry removing test temporary directories when running as deferred deletes
-   using a short delay.
-   Justification:
-     Without this patch running the svnserve-bdb tests on Windows leaves a lot
-     of temporary directories behind, causing testruns to fail on ramdrives.
-   Votes:
-     +1: rhuijben, pburba, breser
-
  * r1483913
    Fix hard-coded version in JavaHL's JNI loader.
    Justification:

Modified: subversion/branches/1.8.x/subversion/tests/cmdline/svntest/sandbox.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/cmdline/svntest/sandbox.py?rev=1485054&r1=1485053&r2=1485054&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/cmdline/svntest/sandbox.py (original)
+++ subversion/branches/1.8.x/subversion/tests/cmdline/svntest/sandbox.py Wed May 22 04:02:17 2013
@@ -389,7 +389,7 @@ def _cleanup_test_path(path, retrying=Fa
     logger.info("CLEANUP: %s", path)
 
   try:
-    svntest.main.safe_rmtree(path)
+    svntest.main.safe_rmtree(path, retrying)
   except:
     logger.info("WARNING: cleanup failed, will try again later")
     _deferred_test_paths.append(path)