Repository: ignite Updated Branches: refs/heads/master ca47e3a37 -> a79d1ec69
IGNITE-10236: MVCC: Create "Cache 3" test suite for MVCC mode. This closes #5445. fix merge conflict Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a79d1ec6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a79d1ec6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a79d1ec6 Branch: refs/heads/master Commit: a79d1ec69b2e9c0ad738f87c68f81773a9a2f5ef Parents: ca47e3a Author: Igor Seliverstov <[email protected]> Authored: Fri Nov 30 16:28:37 2018 +0300 Committer: Igor Seliverstov <[email protected]> Committed: Fri Nov 30 16:28:37 2018 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/testframework/MvccFeatureChecker.java | 2 +- .../org/apache/ignite/testsuites/IgniteCacheMvccTestSuite6.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a79d1ec6/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java b/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java index 07947a9..183c2eb 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java @@ -42,7 +42,7 @@ public class MvccFeatureChecker { CACHE_EVENTS, EVICTION, EXPIRATION, - METRICS + METRICS, INTERCEPTOR } http://git-wip-us.apache.org/repos/asf/ignite/blob/a79d1ec6/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite6.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite6.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite6.java index 688c572..262f3b9 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite6.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite6.java @@ -34,7 +34,6 @@ import org.apache.ignite.internal.processors.cache.datastructures.IgniteExchange import org.apache.ignite.internal.processors.cache.distributed.CacheExchangeMergeTest; import org.apache.ignite.internal.processors.cache.distributed.CacheParallelStartTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCache150ClientsTest; -import org.apache.ignite.internal.processors.cache.distributed.IgniteOptimisticTxSuspendResumeMultiServerTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteOptimisticTxSuspendResumeTest; import org.apache.ignite.internal.processors.cache.transactions.TxOptimisticOnPartitionExchangeTest; import org.apache.ignite.internal.processors.cache.transactions.TxOptimisticPrepareOnUnstableTopologyTest; @@ -62,7 +61,6 @@ public class IgniteCacheMvccTestSuite6 extends TestSuite { // Irrelevant Tx tests. ignoredTests.add(IgniteOptimisticTxSuspendResumeTest.class); - ignoredTests.add(IgniteOptimisticTxSuspendResumeMultiServerTest.class); ignoredTests.add(TxOptimisticPrepareOnUnstableTopologyTest.class); ignoredTests.add(ReplicatedTransactionalOptimisticCacheGetsDistributionTest.class); ignoredTests.add(PartitionedTransactionalOptimisticCacheGetsDistributionTest.class);
