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/04/03 16:48:52 UTC
[50/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-sprint-3' into ignite-560
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-560
Conflicts:
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/edaca38f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/edaca38f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/edaca38f
Branch: refs/heads/ignite-560
Commit: edaca38fcbb0f07552ae9b3c4b1cff40fdfec015
Parents: e96dd28
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 3 17:47:33 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 3 17:47:33 2015 +0300
----------------------------------------------------------------------
.../IgniteCacheFailoverTestSuite.java | 27 +++++---------------
1 file changed, 6 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edaca38f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
index 9556235..ed8303f 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
@@ -34,27 +34,12 @@ public class IgniteCacheFailoverTestSuite extends TestSuite {
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("Cache Failover Test Suite");
- suite.addTestSuite(GridCacheAtomicInvalidPartitionHandlingSelfTest.class);
-
- suite.addTestSuite(GridCacheIncrementTransformTest.class);
-
- // Failure consistency tests.
- suite.addTestSuite(GridCacheAtomicRemoveFailureTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.class);
-
- suite.addTestSuite(GridCacheDhtAtomicRemoveFailureTest.class);
- suite.addTestSuite(GridCacheDhtRemoveFailureTest.class);
- suite.addTestSuite(GridCacheNearRemoveFailureTest.class);
- //suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class); TODO IGNITE-560
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.class);
-
- suite.addTestSuite(GridCacheAtomicFailoverSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.class);
- suite.addTestSuite(GridCacheAtomicReplicatedFailoverSelfTest.class);
-
- //suite.addTestSuite(GridCachePartitionedFailoverSelfTest.class); TODO IGNITE-631.
- //suite.addTestSuite(GridCacheColocatedFailoverSelfTest.class); TODO IGNITE-631.
- //suite.addTestSuite(GridCacheReplicatedFailoverSelfTest.class); TODO IGNITE-631.
+ suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
+ suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
+ suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
+ suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
+ suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
+ suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
return suite;
}