svn commit: r1760359 - in /jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby: FailoverIPRangeTest.java FailoverMultipleClientsTestIT.java

[frm]

Author: frm
Date: Mon Sep 12 13:07:04 2016
New Revision: 1760359

URL: http://svn.apache.org/viewvc?rev=1760359&view=rev
Log:
OAK-4738 - Prevent FailoverIPRangeTest from performing unpredictable DNS 
resolutions

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java
    
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverMultipleClientsTestIT.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java?rev=1760359&r1=1760358&r2=1760359&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java
 Mon Sep 12 13:07:04 2016
@@ -78,11 +78,6 @@ public class FailoverIPRangeTest extends
     }
 
     @Test
-    public void testFailoverInvalidName() throws Exception {
-        createTestWithConfig(new String[]{"foobar"}, false);
-    }
-
-    @Test
     public void testFailoverValidIPRangeStart() throws Exception {
         createTestWithConfig(new String[]{"127.0.0.1-127.0.0.2"}, true);
     }
@@ -104,39 +99,39 @@ public class FailoverIPRangeTest extends
 
     @Test
     public void testFailoverCorrectList() throws Exception {
-        createTestWithConfig(new String[]{"foobar","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[]{"foobar", "122-126", "::1", 
"126.0.0.1", "127.0.0.0-127.255.255.255"}, true);
+            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[]{"foobar", "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[]{"foobar","127-128", 
"0:0:0:0:0:0:0:1", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true);
+            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[]{"foobar", "122-126", 
"::1", "126.0.0.1", "127.0.0.0-127.255.255.255"}, true);
+            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[]{"foobar", "126.0.0.1", 
"::2", "128.0.0.1-255.255.255.255", "128.0.0.0-127.255.255.255"}, false);
+            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);
         }
     }
 

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverMultipleClientsTestIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverMultipleClientsTestIT.java?rev=1760359&r1=1760358&r2=1760359&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverMultipleClientsTestIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverMultipleClientsTestIT.java
 Mon Sep 12 13:07:04 2016
@@ -18,7 +18,9 @@
  */
 package org.apache.jackrabbit.oak.segment.standby;
 
-import org.apache.jackrabbit.oak.segment.SegmentNodeStore;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
 import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
 import org.apache.jackrabbit.oak.segment.SegmentTestUtils;
 import org.apache.jackrabbit.oak.segment.standby.client.StandbyClient;
@@ -28,9 +30,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertEquals;
-
 public class FailoverMultipleClientsTestIT extends TestBase {
 
     @Before