This is an automated email from the ASF dual-hosted git repository. ipavlukhin 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 32bc31e IGNITE-12037 Ignore tests in MVCC PDS 3 suite canonically - Fixes #6741. 32bc31e is described below commit 32bc31eb3a5910a1593f81f650dc970011ddffda Author: ipavlukhin <vololo...@gmail.com> AuthorDate: Sat Aug 3 09:01:00 2019 +0300 IGNITE-12037 Ignore tests in MVCC PDS 3 suite canonically - Fixes #6741. --- .../IgnitePdsContinuousRestartTest.java | 8 ++++++++ .../ignite/testsuites/IgnitePdsMvccTestSuite3.java | 23 +++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java index 0a1b527..b51354d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java @@ -48,6 +48,7 @@ import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.TransactionRollbackException; +import org.junit.Assume; import org.junit.Test; /** @@ -83,6 +84,13 @@ public class IgnitePdsContinuousRestartTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + Assume.assumeFalse("https://issues.apache.org/jira/browse/IGNITE-11937", MvccFeatureChecker.forcedMvcc()); + + super.beforeTest(); + } + + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsMvccTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsMvccTestSuite3.java index 19c2fb9..7269423 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsMvccTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsMvccTestSuite3.java @@ -16,31 +16,22 @@ */ package org.apache.ignite.testsuites; -import java.util.HashSet; -import java.util.List; import org.apache.ignite.IgniteSystemProperties; -import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsContinuousRestartTest; -import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsContinuousRestartTestWithExpiryPolicy; -import org.apache.ignite.testframework.junits.DynamicSuite; +import org.junit.BeforeClass; import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** * Mvcc version of {@link IgnitePdsTestSuite3}. */ -@RunWith(DynamicSuite.class) +@RunWith(Suite.class) +@Suite.SuiteClasses(IgnitePdsTestSuite3.class) public class IgnitePdsMvccTestSuite3 { /** - * @return Suite. + * Enforce MVCC */ - public static List<Class<?>> suite() { + @BeforeClass + public static void enforceMvcc() { System.setProperty(IgniteSystemProperties.IGNITE_FORCE_MVCC_MODE_IN_TESTS, "true"); - - HashSet<Class> ignoredTests = new HashSet<>(); - - // TODO https://issues.apache.org/jira/browse/IGNITE-11937 - ignoredTests.add(IgnitePdsContinuousRestartTest.class); - ignoredTests.add(IgnitePdsContinuousRestartTestWithExpiryPolicy.class); - - return IgnitePdsTestSuite3.suite(ignoredTests); } }