[ignite] branch master updated: IGNITE-10520: MVCC: Exclude non-relevant test scenarios. This closes #5885.

[gv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gvvinblade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 5b2b359  IGNITE-10520: MVCC: Exclude non-relevant test scenarios. This closes #5885.
5b2b359 is described below

commit 5b2b359785d36191171870bdd1dc2dfab98c18b7
Author: ipavlukhin <vo...@gmail.com>
AuthorDate: Wed Jan 30 17:30:24 2019 +0300

    IGNITE-10520: MVCC: Exclude non-relevant test scenarios. This closes #5885.
---
 .../processors/cache/distributed/IgniteCachePrimarySyncTest.java      | 4 ----
 .../java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite9.java  | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePrimarySyncTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePrimarySyncTest.java
index ce983de..3c274e4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePrimarySyncTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePrimarySyncTest.java
@@ -24,13 +24,11 @@ import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteTransactions;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.testframework.MvccFeatureChecker;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.transactions.Transaction;
 import org.apache.ignite.transactions.TransactionConcurrency;
 import org.apache.ignite.transactions.TransactionIsolation;
 import org.jetbrains.annotations.Nullable;
-import org.junit.Assume;
 import org.junit.Test;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
@@ -106,8 +104,6 @@ public class IgniteCachePrimarySyncTest extends GridCommonAbstractTest {
      */
     @Test
     public void testPutGet() throws Exception {
-        Assume.assumeFalse("https://issues.apache.org/jira/browse/IGNITE-10520", MvccFeatureChecker.forcedMvcc());
-
         Ignite ignite = ignite(SRVS);
 
         checkPutGet(ignite.cache(ATOMIC_CACHE), null, null, null);
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite9.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite9.java
index 82c778c..a1bd286 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite9.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite9.java
@@ -25,6 +25,7 @@ import org.apache.ignite.IgniteSystemProperties;
 import org.apache.ignite.internal.processors.cache.IgniteCacheGetCustomCollectionsSelfTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheLoadRebalanceEvictionSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.CacheAtomicPrimarySyncBackPressureTest;
+import org.apache.ignite.internal.processors.cache.distributed.IgniteCachePrimarySyncTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteTxCachePrimarySyncTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteTxConcurrentRemoveObjectsTest;
 import org.apache.ignite.internal.stat.IoStatisticsCachePersistenceSelfTest;
@@ -49,6 +50,7 @@ public class IgniteCacheMvccTestSuite9 {
         ignoredTests.add(IgniteTxConcurrentRemoveObjectsTest.class);
 
         // Non supported modes.
+        ignoredTests.add(IgniteCachePrimarySyncTest.class);
         ignoredTests.add(IgniteTxCachePrimarySyncTest.class);
 
         // Atomic caches.