You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/01 16:23:48 UTC

incubator-ignite git commit: # Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-929

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-929 9c90271a9 -> 5e5f86e79


# Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-929


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

Branch: refs/heads/ignite-929
Commit: 5e5f86e7995d6ee2dfd0a8e7fc031483379e880b
Parents: 9c90271
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jun 1 17:23:30 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jun 1 17:23:30 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/CacheStopAndDestroySelfTest.java       | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e5f86e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
index 0a4bb55..4f9b681 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
@@ -26,6 +26,9 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.plugin.extensions.communication.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.spi.communication.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.testframework.*;
 import org.apache.ignite.testframework.junits.common.*;
 
@@ -36,6 +39,9 @@ import java.util.concurrent.atomic.*;
  * Checks stop and destroy methods behavior.
  */
 public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
+    /** */
+    private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
     /** key-value used at test. */
     protected static String KEY_VAL = "1";
 
@@ -77,6 +83,9 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
         if (getTestGridName(2).equals(gridName))
             iCfg.setClientMode(true);
 
+        ((TcpDiscoverySpi)iCfg.getDiscoverySpi()).setIpFinder(ipFinder);
+        ((TcpDiscoverySpi)iCfg.getDiscoverySpi()).setForceServerMode(true);
+
         iCfg.setCacheConfiguration();
 
         TcpCommunicationSpi commSpi = new CountingTxRequestsToClientNodeTcpCommunicationSpi();