ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [31/31] incubator-ignite git commit: # ignite-648: remove grod count
Date Fri, 26 Jun 2015 13:53:34 GMT
# ignite-648: remove grod count


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

Branch: refs/heads/ignite-648
Commit: cb4e557082a3288c3a4c2975c849ef0a93f438c4
Parents: 15c2821
Author: ashutak <ashutak@gridgain.com>
Authored: Fri Jun 26 16:53:27 2015 +0300
Committer: ashutak <ashutak@gridgain.com>
Committed: Fri Jun 26 16:53:27 2015 +0300

----------------------------------------------------------------------
 .../cache/GridCacheAbstractSelfTest.java           |  5 +++++
 .../testframework/junits/GridAbstractTest.java     | 17 -----------------
 2 files changed, 5 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb4e5570/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
index bb207fc..f75f77d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
@@ -59,6 +59,11 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest
{
     /** VM ip finder for TCP discovery. */
     protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
 
+    /**
+     * @return Grids count to start.
+     */
+    protected abstract int gridCount();
+
     /** {@inheritDoc} */
     @Override protected long getTestTimeout() {
         return TEST_TIMEOUT;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb4e5570/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 2f52224..3ecbe19 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -487,17 +487,7 @@ public abstract class GridAbstractTest extends TestCase {
             }
 
             try {
-                if (isMultiJvm()) {
-                    if (gridCount() < 2)
-                        throw new IllegalStateException("Grid count have to be more 1 in
milti jvm mode.");
-
-                    allNodesJoinLatch = new CountDownLatch(gridCount() - 1);
-                }
-
                 beforeTestsStarted();
-
-                if (isMultiJvm())
-                    assert allNodesJoinLatch.await(20, TimeUnit.SECONDS);
             }
             catch (Exception | Error t) {
                 t.printStackTrace();
@@ -1368,13 +1358,6 @@ public abstract class GridAbstractTest extends TestCase {
     }
 
     /**
-     * @return Grids count to start.
-     */
-    protected int gridCount() {
-        return 0;
-    }
-
-    /**
      * Gets flag whether nodes will run in one jvm or in separate jvms.
      *
      * @return <code>True</code> to run nodes in separate jvms.


Mime
View raw message