This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push: new 76055aa060 PHOENIX-6954 Fix Category for some index related ITs 76055aa060 is described below commit 76055aa06084548a59716dedb38084e4ae3eb5dc Author: Istvan Toth <st...@apache.org> AuthorDate: Thu May 11 16:12:00 2023 +0200 PHOENIX-6954 Fix Category for some index related ITs --- .../apache/phoenix/end2end/IndexUpgradeToolIT.java | 38 ++++++++-------------- .../phoenix/end2end/IndexWithDefaultValueIT.java | 3 +- 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java index dcfd8d50a5..45ca69993a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java @@ -17,20 +17,7 @@ */ package org.apache.phoenix.end2end; -import org.apache.phoenix.mapreduce.index.IndexUpgradeTool; -import org.apache.phoenix.query.BaseTest; -import org.apache.phoenix.util.PhoenixRuntime; -import org.apache.phoenix.util.PropertiesUtil; -import org.apache.phoenix.util.ReadOnlyProps; -import org.apache.phoenix.util.SchemaUtil; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; - +import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; import java.sql.Connection; import java.sql.DriverManager; @@ -39,16 +26,23 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.Properties; -import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; +import org.apache.phoenix.mapreduce.index.IndexUpgradeTool; +import org.apache.phoenix.util.PhoenixRuntime; +import org.apache.phoenix.util.PropertiesUtil; +import org.apache.phoenix.util.SchemaUtil; +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; @RunWith(Parameterized.class) -//FIXME this test is never run by maven, as it has no @Category -public class IndexUpgradeToolIT extends BaseTest { +@Category(ParallelStatsDisabledTest.class) +public class IndexUpgradeToolIT extends ParallelStatsDisabledIT { public static final String VERIFY_COUNT_ASSERT_MESSAGE = "view-index count in system table doesn't match"; @@ -66,12 +60,6 @@ public class IndexUpgradeToolIT extends BaseTest { }); } - @BeforeClass - public static synchronized void setup() throws Exception { - Map<String, String> props = Collections.emptyMap(); - setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator())); - } - @Test public void verifyViewAndViewIndexes() throws Exception { String tableName = generateUniqueName(); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java index a93f4abddf..d1827ae3d2 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java @@ -19,6 +19,7 @@ package org.apache.phoenix.end2end; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.sql.Connection; import java.sql.DriverManager; @@ -30,7 +31,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertEquals; - +@Category(ParallelStatsDisabledTest.class) public class IndexWithDefaultValueIT extends ParallelStatsDisabledIT { @Test