You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/04/14 22:30:18 UTC

[08/18] incubator-geode git commit: GEODE-1198 CI Failure: DistributedSystemDUnitTest.testConflictingUDPPort

GEODE-1198 CI Failure: DistributedSystemDUnitTest.testConflictingUDPPort

For this test, the membership-port-range has only 3 ports available. If in
some rare cases, one of the ports is used by others, it will get RMIException.
So just ignore it. Since adding one more port will also fail the test.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9d20f22f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9d20f22f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9d20f22f

Branch: refs/heads/feature/GEODE-1162
Commit: 9d20f22ff99fc76bf2da3218f02ecb95cbf39b32
Parents: 80533ba
Author: Jianxia Chen <jc...@pivotal.io>
Authored: Wed Apr 13 10:15:08 2016 -0700
Committer: Jianxia Chen <jc...@pivotal.io>
Committed: Wed Apr 13 10:19:08 2016 -0700

----------------------------------------------------------------------
 .../distributed/DistributedSystemDUnitTest.java | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d20f22f/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
index 0109845..22bb176 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
@@ -16,7 +16,10 @@
  */
 package com.gemstone.gemfire.distributed;
 
-import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.net.Inet4Address;
 import java.net.Inet6Address;
@@ -26,8 +29,12 @@ import java.util.Enumeration;
 import java.util.Properties;
 import java.util.concurrent.TimeoutException;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.gemstone.gemfire.CancelException;
 import com.gemstone.gemfire.GemFireConfigException;
+import com.gemstone.gemfire.SystemConnectException;
 import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
@@ -50,11 +57,10 @@ import com.gemstone.gemfire.internal.SocketCreator;
 import com.gemstone.gemfire.test.dunit.DistributedTestUtils;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.RMIException;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 /**
  * Tests the functionality of the {@link DistributedSystem} class.
@@ -387,6 +393,14 @@ public class DistributedSystemDUnitTest extends JUnit4DistributedTestCase {
           } catch (GemFireConfigException e) {
             return; // 
           }
+          catch (RMIException e) {
+            if (e.getCause() instanceof SystemConnectException) {
+              //GEODE-1198: for this test, the membership-port-range has only 3 ports available.
+              //If in some rare cases, one of the ports is used by others, it will get this 
+              //exception. So just ignore it. Since adding one more port will also fail the test.
+              return;
+            }
+          }
           fail("expected a GemFireConfigException but didn't get one");
         }
       });