Author: frm
Date: Thu Nov 23 09:29:42 2017
New Revision: 1816113
URL: http://svn.apache.org/viewvc?rev=1816113&view=rev
Log:
OAK-6975 - Pass operating system information to the Compact tool backend
Modified:
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/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=1816113&r1=1816112&r2=1816113&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
Thu Nov 23 09:29:42 2017
@@ -18,6 +18,7 @@
package org.apache.jackrabbit.oak.segment.upgrade;
+import static com.google.common.base.StandardSystemProperty.OS_NAME;
import static com.google.common.collect.Iterables.transform;
import static java.lang.String.format;
import static java.util.concurrent.TimeUnit.MINUTES;
@@ -42,7 +43,6 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.file.tar.IOMonitorAdapter;
import org.apache.jackrabbit.oak.segment.file.tar.TarFiles;
import org.apache.jackrabbit.oak.segment.tool.Compact;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -96,12 +96,14 @@ public class UpgradeIT {
public void offRCUpgradesSegments() throws IOException,
InvalidFileStoreVersionException {
checkSegmentVersion(V_12);
checkStoreVersion(1);
+
Compact.builder()
- .withPath(fileStoreHome.getRoot())
- .withMmap(true)
- .withForce(true)
- .build()
- .run();
+ .withPath(fileStoreHome.getRoot())
+ .withMmap(true)
+ .withOs(OS_NAME.value())
+ .withForce(true)
+ .build()
+ .run();
// Upgraded
checkStoreVersion(2);
@@ -116,6 +118,7 @@ public class UpgradeIT {
Compact.builder()
.withPath(fileStoreHome.getRoot())
.withMmap(true)
+ .withOs(OS_NAME.value())
.withForce(false)
.build()
.run();