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/17 16:45:36 UTC

[17/50] incubator-ignite git commit: # ignite-883 fixed test

# ignite-883 fixed test


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

Branch: refs/heads/ignite-980
Commit: 22ec5cf2a50ac7719ddc25ed5feb7ca06c491931
Parents: 54bfa36
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jun 16 15:58:53 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jun 16 15:58:53 2015 +0300

----------------------------------------------------------------------
 .../IgniteCacheClientNodeConcurrentStart.java         | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ec5cf2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java
index bd74ece..1eff7fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java
@@ -37,7 +37,7 @@ public class IgniteCacheClientNodeConcurrentStart extends GridCommonAbstractTest
     protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
 
     /** */
-    private static final int NODES_CNT = 5;
+    private static final int NODES_CNT = 6;
 
     /** */
     private Set<Integer> clientNodes;
@@ -83,13 +83,21 @@ public class IgniteCacheClientNodeConcurrentStart extends GridCommonAbstractTest
                 clientNodes = new HashSet<>();
 
                 while (clientNodes.size() < 2)
-                    clientNodes.add(rnd.nextInt(0, NODES_CNT));
+                    clientNodes.add(rnd.nextInt(1, NODES_CNT));
 
                 clientNodes.add(NODES_CNT - 1);
 
                 log.info("Test iteration [iter=" + i + ", clients=" + clientNodes + ']');
 
-                startGridsMultiThreaded(NODES_CNT, true);
+                Ignite srv = startGrid(0); // Start server node first.
+
+                assertFalse(srv.configuration().isClientMode());
+
+                startGridsMultiThreaded(1, NODES_CNT - 1);
+
+                checkTopology(NODES_CNT);
+
+                awaitPartitionMapExchange();
 
                 for (int node : clientNodes) {
                     Ignite ignite = grid(node);