svn commit: r1542817 - /subversion/trunk/subversion/tests/cmdline/svntest/main.py

[rh...@apache.org]

Author: rhuijben
Date: Sun Nov 17 21:00:17 2013
New Revision: 1542817

URL: http://svn.apache.org/r1542817
Log:
* subversion/tests/cmdline/svntest/main.py
  Don't break the entire test run if cleaning the temp directory failed, but
  return a test failure anyway, as we shouldn't keep files locked.

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/main.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1542817&r1=1542816&r2=1542817&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Sun Nov 17 21:00:17 2013
@@ -2145,7 +2145,11 @@ def execute_tests(test_list, serial_only
   # Remove all scratchwork: the 'pristine' repository, greek tree, etc.
   # This ensures that an 'import' will happen the next time we run.
   if not options.is_child_process and not options.keep_local_tmp:
-    safe_rmtree(temp_dir, 1)
+    try:
+      safe_rmtree(temp_dir, 1)
+    except:
+      logger.error("ERROR: cleanup of '%s' directory failed." % temp_dir)
+      exit_code = 1
 
   # Cleanup after ourselves.
   svntest.sandbox.cleanup_deferred_test_paths()