geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bschucha...@apache.org
Subject [1/3] incubator-geode git commit: GEODE-77 changed a few tests to stop using multicast discovery
Date Wed, 09 Sep 2015 18:45:58 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-77 fcc0f34fb -> 299966d7a


GEODE-77 changed a few tests to stop using multicast discovery


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

Branch: refs/heads/feature/GEODE-77
Commit: ea9a739e2657214756f84f0a58dab2db73fa08f6
Parents: fcc0f34
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
Authored: Wed Sep 9 11:41:20 2015 -0700
Committer: Bruce Schuchardt <bschuchardt@pivotal.io>
Committed: Wed Sep 9 11:41:20 2015 -0700

----------------------------------------------------------------------
 .../test/java/com/gemstone/gemfire/cache/Bug42039JUnitTest.java  | 4 +++-
 .../cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java  | 1 +
 .../distributed/internal/InternalDistributedSystemJUnitTest.java | 1 +
 .../cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java   | 4 +++-
 .../com/gemstone/gemfire/memcached/IntegrationJUnitTest.java     | 1 +
 5 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ea9a739e/gemfire-core/src/test/java/com/gemstone/gemfire/cache/Bug42039JUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/Bug42039JUnitTest.java
b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/Bug42039JUnitTest.java
index da7d8aa..5be0c8f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/Bug42039JUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/Bug42039JUnitTest.java
@@ -19,6 +19,7 @@ import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.OSProcess;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
@@ -43,7 +44,8 @@ public class Bug42039JUnitTest {
   public void testBug42039() throws Exception {
     Properties p = new Properties();
     p.setProperty("mcast-port", "0");
-    p.setProperty("locators", "localhost[6666]");
+    int port = AvailablePortHelper.getRandomAvailableTCPPort();
+    p.setProperty("locators", "localhost["+port+"]");
     p.setProperty(DistributionConfig.MEMBER_TIMEOUT_NAME, "1000");
     ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ea9a739e/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
index 0c0719b..314fdfe 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
@@ -37,6 +37,7 @@ public class PdxCopyOnReadQueryJUnitTest {
     CacheFactory cf = new CacheFactory();
     cf.setPdxSerializer(serializer);
     cf.setPdxReadSerialized(false);
+    cf.set("mcast-port", "0");
     cache = cf.create();
     cache.setCopyOnRead(true);
     

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ea9a739e/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
index 13a8122..4e972ac 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -172,6 +172,7 @@ public class InternalDistributedSystemJUnitTest
     Properties props = new Properties();
     int memberTimeout = 100;
     props.put("member-timeout", String.valueOf(memberTimeout));
+    props.put("mcast-port", "0");
 
     DistributionConfig config = createSystem(props).getOriginalConfig();
     assertEquals(memberTimeout, config.getMemberTimeout());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ea9a739e/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
index 21c1a5b..fe3e10c 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
@@ -156,7 +156,9 @@ public class ClientMessagesRegionCreationAndDestroyJUnitTest {
    */
   private Cache createCache() throws CacheException
   {
-    return CacheFactory.create(DistributedSystem.connect(new Properties()));
+    Properties p = new Properties();
+    p.put("mcast-port", "0");
+    return CacheFactory.create(DistributedSystem.connect(p));
   }
   
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ea9a739e/gemfire-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
b/gemfire-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
index 9d5f39e..0a19abc 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
@@ -42,6 +42,7 @@ public class IntegrationJUnitTest {
     Properties props = new Properties();
     final int port = AvailablePortHelper.getRandomAvailableTCPPort();
     props.setProperty("memcached-port", port+"");
+    props.setProperty("mcast-port", "0");
     CacheFactory cf = new CacheFactory(props);
     Cache cache = cf.create();
     


Mime
View raw message