Repository: incubator-ignite Updated Branches: refs/heads/ignite-1090 0df98d204 -> 46b9601bf
# ignite-1090 finishTxs() should wait for rolling back transactions Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/46b9601b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46b9601b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46b9601b Branch: refs/heads/ignite-1090 Commit: 46b9601bf0c532445c2339db178df7d4043c8daa Parents: 0df98d2 Author: sboikov <[email protected]> Authored: Tue Jul 21 14:57:59 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Jul 21 14:57:59 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java | 4 ++++ .../apache/ignite/testsuites/IgniteCacheRestartTestSuite.java | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46b9601b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java index 3bb4e97..c6a4e7b 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java @@ -18,6 +18,7 @@ package org.apache.ignite.testsuites; import junit.framework.*; +import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; @@ -42,6 +43,9 @@ public class IgniteCacheFailoverTestSuite2 { suite.addTestSuite(GridCacheColocatedFailoverSelfTest.class); suite.addTestSuite(GridCacheReplicatedFailoverSelfTest.class); + suite.addTestSuite(CacheGetFromJobTest.class); + suite.addTestSuite(GridCachePartitionedTxSalvageSelfTest.class); + return suite; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46b9601b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java index f0649f5..9928cf3 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java @@ -34,8 +34,6 @@ public class IgniteCacheRestartTestSuite extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("Cache Restart Test Suite"); - suite.addTestSuite(GridCachePartitionedTxSalvageSelfTest.class); - suite.addTestSuite(GridCachePartitionedNodeRestartTest.class); suite.addTestSuite(GridCachePartitionedOptimisticTxNodeRestartTest.class); suite.addTestSuite(GridCacheReplicatedNodeRestartSelfTest.class); @@ -46,7 +44,6 @@ public class IgniteCacheRestartTestSuite extends TestSuite { suite.addTestSuite(IgniteCacheAtomicPutAllFailoverSelfTest.class); suite.addTestSuite(IgniteCachePutAllRestartTest.class); suite.addTestSuite(GridCachePutAllFailoverSelfTest.class); - suite.addTestSuite(CacheGetFromJobTest.class); return suite; }
