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/11/10 13:53:46 UTC
[50/50] [abbrv] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.5' into ignite-1758-debug
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1758-debug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7723fe1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7723fe1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7723fe1
Branch: refs/heads/ignite-1758-debug
Commit: e7723fe16effb8933533f8b4993c3963349a284b
Parents: d008063
Author: sboikov <sb...@gridgain.com>
Authored: Tue Nov 10 15:51:13 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Nov 10 15:51:13 2015 +0300
----------------------------------------------------------------------
.../testsuites/IgniteClientNodesTestSuite.java | 3 --
.../ignite/testsuites/IgniteSpiTestSuite.java | 33 ++++++++++++++++++--
2 files changed, 31 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e7723fe1/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
index d54b890..c9405fa 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
@@ -21,7 +21,6 @@ import junit.framework.TestSuite;
import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodeConcurrentStart;
import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientReconnectTest;
import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheManyClientsTest;
-import org.apache.ignite.spi.discovery.tcp.IgniteClientReconnectMassiveShutdownTest;
/**
*
@@ -34,8 +33,6 @@ public class IgniteClientNodesTestSuite extends TestSuite {
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("Ignite Client Nodes Reconnect Test Suite");
- suite.addTestSuite(IgniteClientReconnectMassiveShutdownTest.class);
-
suite.addTest(IgniteClientReconnectTestSuite.suite());
suite.addTestSuite(IgniteCacheManyClientsTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e7723fe1/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
index fb05d01..fc4023a 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
@@ -19,7 +19,6 @@ package org.apache.ignite.testsuites;
import junit.framework.TestSuite;
import org.apache.ignite.internal.managers.GridNoopManagerSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryMultiThreadedTest;
/**
* Grid SPI test suite.
@@ -32,8 +31,38 @@ public class IgniteSpiTestSuite extends TestSuite {
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("Ignite SPIs Test Suite");
+ // Failover.
+ suite.addTest(IgniteSpiFailoverSelfTestSuite.suite());
+
+ // Collision.
+ suite.addTest(IgniteSpiCollisionSelfTestSuite.suite());
+
+ // Event storage.
+ suite.addTest(IgniteSpiEventStorageSelfTestSuite.suite());
+
+ // Load Balancing.
+ suite.addTest(IgniteSpiLoadBalancingSelfTestSuite.suite());
+
+ // Swap space.
+ suite.addTest(IgniteSpiSwapSpaceSelfTestSuite.suite());
+
+ // Checkpoints.
+ suite.addTest(IgniteSpiCheckpointSelfTestSuite.suite());
+
+ // Deployment
+ suite.addTest(IgniteSpiDeploymentSelfTestSuite.suite());
+
+ // Discovery.
+ suite.addTest(IgniteSpiDiscoverySelfTestSuite.suite());
+
+ // Communication.
+ suite.addTest(IgniteSpiCommunicationSelfTestSuite.suite());
+
+ // Indexing.
+ suite.addTest(IgniteSpiIndexingSelfTestSuite.suite());
+
// All other tests.
- suite.addTestSuite(TcpDiscoveryMultiThreadedTest.class);
+ suite.addTestSuite(GridNoopManagerSelfTest.class);
return suite;
}