You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by fr...@apache.org on 2016/12/08 10:21:10 UTC
svn commit: r1773209 - in /jackrabbit/oak/trunk:
oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java
Author: frm
Date: Thu Dec 8 10:21:10 2016
New Revision: 1773209
URL: http://svn.apache.org/viewvc?rev=1773209&view=rev
Log:
OAK-5252 - Disable IPv6 tests on Jenkins nodes labelled "beam"
Modified:
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java
Modified: jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java?rev=1773209&r1=1773208&r2=1773209&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java Thu Dec 8 10:21:10 2016
@@ -61,4 +61,17 @@ public final class CIHelper {
return equal(getenv("PROFILE"), "integrationTesting");
}
+ public static boolean jenkinsNodeLabel(String label) {
+ String labels = getenv("NODE_LABELS");
+ if (labels == null) {
+ return false;
+ }
+ for (String l: labels.trim().split("\\s+")) {
+ if (l.equals(label)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java?rev=1773209&r1=1773208&r2=1773209&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java Thu Dec 8 10:21:10 2016
@@ -19,9 +19,11 @@
package org.apache.jackrabbit.oak.segment.standby;
+import static org.apache.jackrabbit.oak.commons.CIHelper.jenkinsNodeLabel;
import static org.apache.jackrabbit.oak.segment.SegmentTestUtils.addTestContent;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assume.assumeFalse;
import java.io.File;
@@ -56,89 +58,89 @@ public class FailoverIPRangeIT extends T
@Test
public void testFailoverLocalClient() throws Exception {
- createTestWithConfig(new String[]{"127.0.0.1"}, true);
+ createTestWithConfig(new String[] {"127.0.0.1"}, true);
}
@Test
public void testFailoverLocalClientUseIPv6() throws Exception {
- if (!noDualStackSupport) {
- createTestWithConfig("::1", new String[]{"::1"}, true);
- }
+ assumeFalse(jenkinsNodeLabel("beam"));
+ assumeFalse(noDualStackSupport);
+ createTestWithConfig("::1", new String[] {"::1"}, true);
}
@Test
public void testFailoverWrongClient() throws Exception {
- createTestWithConfig(new String[]{"127.0.0.2"}, false);
+ createTestWithConfig(new String[] {"127.0.0.2"}, false);
}
@Test
public void testFailoverWrongClientIPv6() throws Exception {
- if (!noDualStackSupport) {
- createTestWithConfig(new String[]{"::2"}, false);
- }
+ assumeFalse(jenkinsNodeLabel("beam"));
+ assumeFalse(noDualStackSupport);
+ createTestWithConfig(new String[] {"::2"}, false);
}
@Test
public void testFailoverLocalhost() throws Exception {
- createTestWithConfig(new String[]{"localhost"}, true);
+ createTestWithConfig(new String[] {"localhost"}, true);
}
@Test
public void testFailoverValidIPRangeStart() throws Exception {
- createTestWithConfig(new String[]{"127.0.0.1-127.0.0.2"}, true);
+ createTestWithConfig(new String[] {"127.0.0.1-127.0.0.2"}, true);
}
@Test
public void testFailoverValidIPRangeEnd() throws Exception {
- createTestWithConfig(new String[]{"127.0.0.0-127.0.0.1"}, true);
+ createTestWithConfig(new String[] {"127.0.0.0-127.0.0.1"}, true);
}
@Test
public void testFailoverValidIPRange() throws Exception {
- createTestWithConfig(new String[]{"127.0.0.0-127.0.0.2"}, true);
+ createTestWithConfig(new String[] {"127.0.0.0-127.0.0.2"}, true);
}
@Test
public void testFailoverInvalidRange() throws Exception {
- createTestWithConfig(new String[]{"127.0.0.2-127.0.0.1"}, false);
+ createTestWithConfig(new String[] {"127.0.0.2-127.0.0.1"}, false);
}
@Test
public void testFailoverCorrectList() throws Exception {
- createTestWithConfig(new String[]{"127-128","126.0.0.1", "127.0.0.0-127.255.255.255"}, true);
+ createTestWithConfig(new String[] {"127-128", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true);
}
@Test
public void testFailoverCorrectListIPv6() throws Exception {
- if (!noDualStackSupport) {
- createTestWithConfig(new String[]{"122-126", "::1", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true);
- }
+ assumeFalse(jenkinsNodeLabel("beam"));
+ assumeFalse(noDualStackSupport);
+ createTestWithConfig(new String[] {"122-126", "::1", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true);
}
@Test
public void testFailoverWrongList() throws Exception {
- createTestWithConfig(new String[]{"126.0.0.1", "::2", "128.0.0.1-255.255.255.255", "128.0.0.0-127.255.255.255"}, false);
+ createTestWithConfig(new String[] {"126.0.0.1", "::2", "128.0.0.1-255.255.255.255", "128.0.0.0-127.255.255.255"}, false);
}
@Test
public void testFailoverCorrectListUseIPv6() throws Exception {
- if (!noDualStackSupport) {
- createTestWithConfig("::1", new String[]{"127-128", "0:0:0:0:0:0:0:1", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true);
- }
+ assumeFalse(jenkinsNodeLabel("beam"));
+ assumeFalse(noDualStackSupport);
+ createTestWithConfig("::1", new String[] {"127-128", "0:0:0:0:0:0:0:1", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true);
}
@Test
public void testFailoverCorrectListIPv6UseIPv6() throws Exception {
- if (!noDualStackSupport) {
- createTestWithConfig("::1", new String[]{"122-126", "::1", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true);
- }
+ assumeFalse(jenkinsNodeLabel("beam"));
+ assumeFalse(noDualStackSupport);
+ createTestWithConfig("::1", new String[] {"122-126", "::1", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true);
}
@Test
public void testFailoverWrongListUseIPv6() throws Exception {
- if (!noDualStackSupport) {
- createTestWithConfig("::1", new String[]{"126.0.0.1", "::2", "128.0.0.1-255.255.255.255", "128.0.0.0-127.255.255.255"}, false);
- }
+ assumeFalse(jenkinsNodeLabel("beam"));
+ assumeFalse(noDualStackSupport);
+ createTestWithConfig("::1", new String[] {"126.0.0.1", "::2", "128.0.0.1-255.255.255.255", "128.0.0.0-127.255.255.255"}, false);
}
private void createTestWithConfig(String[] ipRanges, boolean expectedToWork) throws Exception {