Repository: ignite Updated Branches: refs/heads/ignite-6467-1 [created] 6f92ee078
ignite-6467 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f92ee07 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f92ee07 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f92ee07 Branch: refs/heads/ignite-6467-1 Commit: 6f92ee078a97adf238311070e22dccacfc82877b Parents: 5734b4d Author: sboikov <sboi...@apache.org> Authored: Tue Jul 24 10:20:50 2018 +0300 Committer: sboikov <sboi...@apache.org> Committed: Tue Jul 24 10:20:50 2018 +0300 ---------------------------------------------------------------------- .../distributed/CacheExchangeMergeTest.java | 6 ++- .../testsuites/IgniteCacheTestSuite6.java | 57 +------------------- 2 files changed, 6 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6f92ee07/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java index 4b281b0..1183634 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java @@ -1426,8 +1426,10 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest { tx.commit(); } } - catch (ClusterTopologyException ignore) { - // No-op. + catch (ClusterTopologyException e) { + info("Tx failed, ignore: " + e); + + return; } for (Map.Entry<Object, Object> e : map.entrySet()) http://git-wip-us.apache.org/repos/asf/ignite/blob/6f92ee07/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java index 77285be..347e32a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java @@ -67,61 +67,8 @@ public class IgniteCacheTestSuite6 extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("IgniteCache Test Suite part 6"); - suite.addTestSuite(CachePartitionStateTest.class); - - suite.addTestSuite(GridCachePartitionEvictionDuringReadThroughSelfTest.class); - suite.addTestSuite(IgniteOptimisticTxSuspendResumeTest.class); - suite.addTestSuite(IgniteOptimisticTxSuspendResumeMultiServerTest.class); - suite.addTestSuite(IgnitePessimisticTxSuspendResumeTest.class); - - suite.addTestSuite(CacheExchangeMergeTest.class); - - suite.addTestSuite(TxRollbackOnTimeoutTest.class); - suite.addTestSuite(TxRollbackOnTimeoutNoDeadlockDetectionTest.class); - suite.addTestSuite(TxRollbackOnTimeoutNearCacheTest.class); - suite.addTestSuite(TxWithSmallTimeoutAndContentionOneKeyTest.class); - suite.addTestSuite(IgniteCacheThreadLocalTxTest.class); - suite.addTestSuite(TxRollbackAsyncTest.class); - suite.addTestSuite(TxRollbackAsyncNearCacheTest.class); - suite.addTestSuite(TxRollbackAsyncWithPersistenceTest.class); - suite.addTestSuite(TxRollbackOnTopologyChangeTest.class); - - suite.addTestSuite(TxOptimisticPrepareOnUnstableTopologyTest.class); - - suite.addTestSuite(TxLabelTest.class); - - suite.addTestSuite(TxMultiCacheAsyncOpsTest.class); - - suite.addTestSuite(TxOnCachesStartTest.class); - - suite.addTestSuite(IgnitePdsCacheAssignmentNodeRestartsTest.class); - - suite.addTestSuite(WalModeChangeSelfTest.class); - suite.addTestSuite(WalModeChangeCoordinatorNotAffinityNodeSelfTest.class); - suite.addTestSuite(WalModeChangeAdvancedSelfTest.class); - - suite.addTestSuite(IgniteCache150ClientsTest.class); - -// TODO enable this test after IGNITE-6753, now it takes too long -// suite.addTestSuite(IgniteOutOfMemoryPropagationTest.class); - - suite.addTestSuite(AuthenticationConfigurationClusterTest.class); - suite.addTestSuite(AuthenticationProcessorSelfTest.class); - suite.addTestSuite(AuthenticationOnNotActiveClusterTest.class); - suite.addTestSuite(AuthenticationProcessorNodeRestartTest.class); - suite.addTestSuite(AuthenticationProcessorNPEOnStartTest.class); - - suite.addTestSuite(ReplicatedAtomicCacheGetsDistributionTest.class); - suite.addTestSuite(ReplicatedTransactionalOptimisticCacheGetsDistributionTest.class); - suite.addTestSuite(ReplicatedTransactionalPessimisticCacheGetsDistributionTest.class); - - suite.addTestSuite(PartitionedAtomicCacheGetsDistributionTest.class); - suite.addTestSuite(PartitionedTransactionalOptimisticCacheGetsDistributionTest.class); - suite.addTestSuite(PartitionedTransactionalPessimisticCacheGetsDistributionTest.class); - - suite.addTestSuite(TxOptimisticOnPartitionExchangeTest.class); - - suite.addTestSuite(IgniteExchangeLatchManagerCoordinatorFailTest.class); + for (int i = 0; i < 10; i++) + suite.addTestSuite(CacheExchangeMergeTest.class); return suite; }
