diff --git oak-segment-tar/pom.xml oak-segment-tar/pom.xml index 94f050f..c23a85b 100644 --- oak-segment-tar/pom.xml +++ oak-segment-tar/pom.xml @@ -102,6 +102,7 @@ 2.19.1 + SEGMENT_TAR ${standby.server.port} ${standby.proxy.port} diff --git oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java index 1db5eb7..59a725c 100644 --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java @@ -30,7 +30,6 @@ import java.io.File; import java.io.IOException; import java.util.Random; -import com.google.common.io.ByteStreams; import org.apache.jackrabbit.core.data.FileDataStore; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.CommitFailedException; @@ -48,8 +47,11 @@ import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; +import com.google.common.io.ByteStreams; + public class DataStoreTestBase extends TestBase { protected boolean storesCanBeEqual = false; @@ -91,6 +93,7 @@ public class DataStoreTestBase extends TestBase { } @Test + @Ignore("OAK-4708") public void testSync() throws Exception { final int mb = 1 * 1024 * 1024; final int blobSize = 5 * mb; @@ -128,36 +131,43 @@ public class DataStoreTestBase extends TestBase { } @Test + @Ignore("OAK-4708") public void testProxySkippedBytes() throws Exception { useProxy(100, 1, -1, false); } @Test + @Ignore("OAK-4708") public void testProxySkippedBytesIntermediateChange() throws Exception { useProxy(100, 1, -1, true); } @Test + @Ignore("OAK-4708") public void testProxyFlippedStartByte() throws Exception { useProxy(0, 0, 0, false); } @Test + @Ignore("OAK-4708") public void testProxyFlippedIntermediateByte() throws Exception { useProxy(0, 0, 150, false); } @Test + @Ignore("OAK-4708") public void testProxyFlippedIntermediateByte2() throws Exception { useProxy(0, 0, 150000, false); } @Test + @Ignore("OAK-4708") public void testProxyFlippedIntermediateByteChange() throws Exception { useProxy(0, 0, 150, true); } @Test + @Ignore("OAK-4708") public void testProxyFlippedIntermediateByteChange2() throws Exception { useProxy(0, 0, 150000, true); } diff --git oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java index ba79a71..e4d3b99 100644 --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java @@ -29,6 +29,7 @@ import org.apache.jackrabbit.oak.segment.standby.server.StandbyServer; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; public class FailoverIPRangeTest extends TestBase { @@ -103,6 +104,7 @@ public class FailoverIPRangeTest extends TestBase { } @Test + @Ignore("OAK-4708") public void testFailoverCorrectList() throws Exception { createTestWithConfig(new String[]{"foobar","127-128","126.0.0.1", "127.0.0.0-127.255.255.255"}, true); } @@ -127,6 +129,7 @@ public class FailoverIPRangeTest extends TestBase { } @Test + @Ignore("OAK-4708") public void testFailoverCorrectListIPv6UseIPv6() throws Exception { if (!noDualStackSupport) { createTestWithConfig("::1", new String[]{"foobar", "122-126", "::1", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true); diff --git oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanTest.java oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanTest.java index 3e8abf7..5b636c1 100644 --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanTest.java +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanTest.java @@ -51,6 +51,7 @@ public class MBeanTest extends TestBase { } @Test + @Ignore("OAK-4708") public void testServerEmptyConfig() throws Exception { final StandbyServer server = new StandbyServer(this.port, this.storeS); server.start(); @@ -86,6 +87,7 @@ public class MBeanTest extends TestBase { } @Test + @Ignore("OAK-4708") public void testClientEmptyConfigNoServer() throws Exception { final StandbyClient client = newStandbyClient(storeC); client.start(); @@ -122,6 +124,7 @@ public class MBeanTest extends TestBase { } @Test + @Ignore("OAK-4708") public void testClientNoServer() throws Exception { System.setProperty(StandbyClient.CLIENT_ID_PROPERTY_NAME, "Foo"); final StandbyClient client = newStandbyClient(storeC);