Revert "PHOENIX-4769 Annotate SystemCatalogIT so that it will run with the test suite"
This reverts commit 27a66607f3f67273367c7c5d2b1d20b721ec227b.
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogIT.java
index 2626ad6..15af2af 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogIT.java
@@ -19,6 +19,7 @@
package org.apache.phoenix.end2end;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -26,18 +27,14 @@
import java.sql.Statement;
import java.util.Properties;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.RegionLocator;
-import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(NeedsOwnMiniClusterTest.class)
-public class SystemCatalogIT extends BaseTest {
+public class SystemCatalogIT {
private HBaseTestingUtility testUtil = null;
@After
@@ -61,17 +58,13 @@
TableName systemCatalog = TableName.valueOf("SYSTEM.CATALOG");
RegionLocator rl = testUtil.getConnection().getRegionLocator(systemCatalog);
assertEquals(rl.getAllRegionLocations().size(), 1);
- try {
- // now attempt to split SYSTEM.CATALOG
- testUtil.getHBaseAdmin().split(systemCatalog);
- // make sure the split finishes (there's no synchronous splitting before HBase 2.x)
- testUtil.getHBaseAdmin().disableTable(systemCatalog);
- testUtil.getHBaseAdmin().enableTable(systemCatalog);
- } catch (DoNotRetryIOException e) {
- // table is not splittable
- assert (e.getMessage().contains("NOT splittable"));
- }
+ // now attempt to split SYSTEM.CATALOG
+ testUtil.getHBaseAdmin().split(systemCatalog);
+
+ // make sure the split finishes (there's no synchronous splitting before HBase 2.x)
+ testUtil.getHBaseAdmin().disableTable(systemCatalog);
+ testUtil.getHBaseAdmin().enableTable(systemCatalog);
// test again... Must still be exactly one region.
rl = testUtil.getConnection().getRegionLocator(systemCatalog);
