svn commit: r1808731 - in /jackrabbit/oak/trunk/oak-segment-tar/src: main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java

[frm]

Author: frm
Date: Mon Sep 18 15:06:06 2017
New Revision: 1808731

URL: http://svn.apache.org/viewvc?rev=1808731&view=rev
Log:
OAK-6648 - Fix UpgradeIT for Windows

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
    
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1808731&r1=1808730&r2=1808731&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
 Mon Sep 18 15:06:06 2017
@@ -442,8 +442,8 @@ public class FileStore extends AbstractF
         closeAndLogOnFail(closer);
 
         // Try removing pending files in case the scheduler didn't have a 
chance to run yet
-        fileReaper.reap();
         System.gc(); // for any memory-mappings that are no longer used
+        fileReaper.reap();
 
         log.info("TarMK closed: {}", directory);
     }

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java?rev=1808731&r1=1808730&r2=1808731&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
 Mon Sep 18 15:06:06 2017
@@ -29,7 +29,6 @@ import static org.apache.jackrabbit.oak.
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeFalse;
 
 import java.io.File;
 import java.io.IOException;
@@ -37,7 +36,6 @@ import java.lang.ProcessBuilder.Redirect
 
 import javax.annotation.Nonnull;
 
-import org.apache.jackrabbit.oak.commons.CIHelper;
 import org.apache.jackrabbit.oak.segment.SegmentVersion;
 import org.apache.jackrabbit.oak.segment.data.SegmentData;
 import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
@@ -51,10 +49,8 @@ import org.junit.rules.TemporaryFolder;
 
 public class UpgradeIT {
 
-    private final File upgradeItHome = new File("target/upgrade-it");
-
     @Rule
-    public TemporaryFolder fileStoreHome = new TemporaryFolder(upgradeItHome);
+    public TemporaryFolder fileStoreHome = new TemporaryFolder(new 
File("target"));
 
     /**
      * Launch a groovy script in an Oak 1.6. console to initialise the upgrade
@@ -62,13 +58,11 @@ public class UpgradeIT {
      */
     @Before
     public void setup() throws IOException, InterruptedException {
-        assumeFalse(CIHelper.windows());  // FIXME OAK-6648: fails on Windows
-
         Process oakConsole = new ProcessBuilder(
                 "java", "-jar", "oak-run.jar",
                 "console", fileStoreHome.getRoot().getAbsolutePath(), 
"--read-write",
                 ":load create16store.groovy")
-                .directory(upgradeItHome)
+                .directory(new File("target", "upgrade-it"))
                 .redirectError(Redirect.INHERIT)
                 .redirectOutput(Redirect.INHERIT)
                 .redirectInput(Redirect.INHERIT)
@@ -130,7 +124,7 @@ public class UpgradeIT {
     }
 
     private void checkStoreVersion(int version) throws IOException, 
InvalidFileStoreVersionException {
-        newManifestChecker(new File(fileStoreHome.getRoot(), "/manifest"),
+        newManifestChecker(new File(fileStoreHome.getRoot(), "manifest"),
                 true, version, version).checkManifest();
     }