Index: src/test/java/org/apache/hadoop/hbase/regionserver/TestMXBean.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/regionserver/TestMXBean.java (revision 1327369) +++ src/test/java/org/apache/hadoop/hbase/regionserver/TestMXBean.java (working copy) @@ -21,10 +21,13 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.master.HMaster; +import org.apache.hadoop.hbase.MediumTests; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(MediumTests.class) public class TestMXBean { private static final HBaseTestingUtility TEST_UTIL = @@ -55,4 +58,8 @@ Assert.assertEquals(rs.getZooKeeperWatcher().getQuorum(), info.getZookeeperQuorum()); } + + @org.junit.Rule + public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu = + new org.apache.hadoop.hbase.ResourceCheckerJUnitRule(); } Index: src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenMasterInitializing.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenMasterInitializing.java (revision 1327369) +++ src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenMasterInitializing.java (working copy) @@ -49,11 +49,14 @@ import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread; import org.apache.hadoop.hbase.util.Threads; +import org.apache.hadoop.hbase.LargeTests; import org.apache.zookeeper.KeeperException; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(LargeTests.class) public class TestRSKilledWhenMasterInitializing { private static final Log LOG = LogFactory.getLog(TestMasterFailover.class); @@ -257,5 +260,4 @@ @org.junit.Rule public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu = new org.apache.hadoop.hbase.ResourceCheckerJUnitRule(); - } Index: src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java (revision 1327369) +++ src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java (working copy) @@ -61,6 +61,7 @@ import org.apache.hadoop.hbase.zookeeper.ZKAssign; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; +import org.apache.hadoop.hbase.MediumTests; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.Watcher; import org.apache.zookeeper.KeeperException.NodeExistsException; @@ -79,7 +80,7 @@ /** * Test {@link AssignmentManager} */ -@Category(SmallTests.class) +@Category(MediumTests.class) public class TestAssignmentManager { private static final HBaseTestingUtility HTU = new HBaseTestingUtility(); private static final ServerName SERVERNAME_A = Index: src/test/java/org/apache/hadoop/hbase/master/TestMXBean.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/master/TestMXBean.java (revision 1327369) +++ src/test/java/org/apache/hadoop/hbase/master/TestMXBean.java (working copy) @@ -26,10 +26,13 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HServerLoad; import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.MediumTests; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(MediumTests.class) public class TestMXBean { private static final HBaseTestingUtility TEST_UTIL = @@ -92,4 +95,7 @@ } + @org.junit.Rule + public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu = + new org.apache.hadoop.hbase.ResourceCheckerJUnitRule(); } Index: src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java (revision 1327369) +++ src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java (working copy) @@ -44,6 +44,7 @@ import org.apache.hadoop.hbase.zookeeper.RootRegionTracker; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; +import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.io.MapWritable; import org.apache.hadoop.io.Text; import org.apache.zookeeper.KeeperException; @@ -52,6 +53,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; +import org.junit.experimental.categories.Category; /** * Standup the master and fake it to test various aspects of master function. @@ -61,6 +63,7 @@ * TODO: Speed up the zk connection by Master. It pauses 5 seconds establishing * session. */ +@Category(MediumTests.class) public class TestMasterNoCluster { private static final HBaseTestingUtility TESTUTIL = new HBaseTestingUtility(); @@ -326,4 +329,8 @@ master.join(); } } + + @org.junit.Rule + public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu = + new org.apache.hadoop.hbase.ResourceCheckerJUnitRule(); } Index: src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java (revision 1327369) +++ src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java (working copy) @@ -34,7 +34,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; - +import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.KeyValue; @@ -50,6 +50,7 @@ import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; + import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; import org.junit.AfterClass; @@ -64,7 +65,7 @@ * Verifies ProcessRowEndpoint works. * The tested RowProcessor performs two scans and a read-modify-write. */ -@Category(SmallTests.class) +@Category(MediumTests.class) public class TestRowProcessorEndpoint { static final Log LOG = LogFactory.getLog(TestRowProcessorEndpoint.class); Index: src/test/java/org/apache/hadoop/hbase/metrics/TestExponentiallyDecayingSample.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/metrics/TestExponentiallyDecayingSample.java (revision 1327369) +++ src/test/java/org/apache/hadoop/hbase/metrics/TestExponentiallyDecayingSample.java (working copy) @@ -22,8 +22,11 @@ import org.apache.hadoop.hbase.metrics.histogram.ExponentiallyDecayingSample; import org.apache.hadoop.hbase.metrics.histogram.Snapshot; +import org.apache.hadoop.hbase.SmallTests; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(SmallTests.class) public class TestExponentiallyDecayingSample { @Test @@ -60,4 +63,8 @@ Assert.assertTrue(i >= 0.0 && i < 1000.0); } } + + @org.junit.Rule + public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu = + new org.apache.hadoop.hbase.ResourceCheckerJUnitRule(); } Index: src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsHistogram.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsHistogram.java (revision 1327369) +++ src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsHistogram.java (working copy) @@ -23,9 +23,12 @@ import org.apache.hadoop.hbase.metrics.histogram.MetricsHistogram; import org.apache.hadoop.hbase.metrics.histogram.Snapshot; +import org.apache.hadoop.hbase.SmallTests; import org.junit.Assert; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(SmallTests.class) public class TestMetricsHistogram { @Test @@ -95,4 +98,8 @@ && s.get95thPercentile() <= maxAcceptableninetyFifth); } + + @org.junit.Rule + public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu = + new org.apache.hadoop.hbase.ResourceCheckerJUnitRule(); } Index: src/test/java/org/apache/hadoop/hbase/metrics/TestExactCounterMetric.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/metrics/TestExactCounterMetric.java (revision 1327369) +++ src/test/java/org/apache/hadoop/hbase/metrics/TestExactCounterMetric.java (working copy) @@ -23,8 +23,11 @@ import junit.framework.Assert; import org.apache.hadoop.hbase.util.Pair; +import org.apache.hadoop.hbase.SmallTests; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(SmallTests.class) public class TestExactCounterMetric { @Test @@ -44,4 +47,8 @@ i--; } } + + @org.junit.Rule + public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu = + new org.apache.hadoop.hbase.ResourceCheckerJUnitRule(); } Index: src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java (revision 1327369) +++ src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java (working copy) @@ -34,6 +34,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.MediumTests; import org.apache.log4j.AppenderSkeleton; import org.apache.log4j.Logger; import org.apache.log4j.spi.LoggingEvent; Index: src/test/java/org/apache/hadoop/hbase/ipc/TestPBOnWritableRpc.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/ipc/TestPBOnWritableRpc.java (revision 1327369) +++ src/test/java/org/apache/hadoop/hbase/ipc/TestPBOnWritableRpc.java (working copy) @@ -27,12 +27,16 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; +import org.apache.hadoop.hbase.MediumTests; import org.junit.Test; import com.google.protobuf.DescriptorProtos; import com.google.protobuf.DescriptorProtos.EnumDescriptorProto; +import org.junit.experimental.categories.Category; + /** Unit tests to test PB-based types on WritableRpcEngine. */ +@Category(MediumTests.class) public class TestPBOnWritableRpc { private static Configuration conf = new Configuration(); @@ -124,4 +128,8 @@ public static void main(String[] args) throws Exception { new TestPBOnWritableRpc().testCallsInternal(conf); } + + @org.junit.Rule + public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu = + new org.apache.hadoop.hbase.ResourceCheckerJUnitRule(); } Index: src/test/java/org/apache/hadoop/hbase/util/TestProcessBasedCluster.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/util/TestProcessBasedCluster.java (revision 1327369) +++ src/test/java/org/apache/hadoop/hbase/util/TestProcessBasedCluster.java (working copy) @@ -29,11 +29,14 @@ import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; +import org.apache.hadoop.hbase.MediumTests; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * A basic unit test that spins up a local HBase cluster. */ +@Category(MediumTests.class) public class TestProcessBasedCluster { private static final Log LOG = LogFactory.getLog(TestProcessBasedCluster.class); @@ -86,4 +89,7 @@ assertTrue(pom.getPath() + " does not exist", pom.exists()); } + @org.junit.Rule + public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu = + new org.apache.hadoop.hbase.ResourceCheckerJUnitRule(); }