svn commit: r1763502 - in /jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade: UpgradeOldSegmentTest.java cli/container/SegmentTarNodeStoreContainer.java

[tomekr]

Author: tomekr
Date: Thu Oct  6 06:57:03 2016
New Revision: 1763502

URL: http://svn.apache.org/viewvc?rev=1763502&view=rev
Log:
OAK-4828: oak-ugrade tests fail with segment tar 0.0.12 (on Windows)

Don't throw an exception if the directory can't be deleted.

Modified:
    
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeOldSegmentTest.java
    
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeOldSegmentTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeOldSegmentTest.java?rev=1763502&r1=1763501&r2=1763502&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeOldSegmentTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeOldSegmentTest.java
 Thu Oct  6 06:57:03 2016
@@ -18,6 +18,7 @@
  */
 package org.apache.jackrabbit.oak.upgrade;
 
+import static 
org.apache.jackrabbit.oak.upgrade.cli.container.SegmentTarNodeStoreContainer.deleteRecursive;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -113,6 +114,6 @@ public class UpgradeOldSegmentTest {
         }
         newRepoContainer.close();
         newRepoContainer.clean();
-        FileUtils.deleteDirectory(testFolder);
+        deleteRecursive(testFolder);
     }
 }

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java?rev=1763502&r1=1763501&r2=1763502&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java
 Thu Oct  6 06:57:03 2016
@@ -102,7 +102,7 @@ public class SegmentTarNodeStoreContaine
         return directory;
     }
 
-    static void deleteRecursive(File directory) {
+    public static void deleteRecursive(File directory) {
         try {
             Files.walkFileTree(directory.toPath(), new 
SimpleFileVisitor<Path>() {
                 @Override