diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtil.java index d1b1382c33de..e40a74f49770 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtil.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtil.java @@ -2293,8 +2293,7 @@ public HRegionServer getRSForFirstRegionInTable(TableName tableName) /** * Starts a MiniMRCluster with a default number of TaskTracker's. * MiniMRCluster caches hadoop.log.dir when first started. It is not possible to start multiple - * MiniMRCluster instances with different log dirs. MiniMRCluster is only to be used from when the - * test is run from a separate VM (i.e not in SmallTests) + * MiniMRCluster instances with different log dirs. * @throws IOException When starting the cluster fails. */ public MiniMRCluster startMiniMapReduceCluster() throws IOException { @@ -2308,8 +2307,7 @@ public MiniMRCluster startMiniMapReduceCluster() throws IOException { /** * Starts a MiniMRCluster. Call {@link #setFileSystemURI(String)} to use a different * filesystem. MiniMRCluster caches hadoop.log.dir when first started. It is not possible to start - * multiple MiniMRCluster instances with different log dirs. MiniMRCluster is only to be used from - * when the test is run from a separate VM (i.e not in SmallTests) + * multiple MiniMRCluster instances with different log dirs. * @param servers The number of TaskTracker's to start. * @throws IOException When starting the cluster fails. */ diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc index 0844bafd4868..69773afa1002 100644 --- a/src/main/asciidoc/_chapters/developer.adoc +++ b/src/main/asciidoc/_chapters/developer.adoc @@ -1308,12 +1308,11 @@ to put on your new HBase test case. .Categorizing Tests Small Tests (((SmallTests))):: - _Small_ test cases are executed in a shared JVM and each test suite/test class should + _Small_ test cases are executed in separate JVM and each test suite/test class should run in 15 seconds or less; i.e. a link:https://en.wikipedia.org/wiki/JUnit[junit test fixture], a java object made up of test methods, should finish in under 15 seconds, no matter how many or how few test methods it has. These test cases should not use a minicluster as a minicluster starts many services, - most unrelated to what is being tested. Multiple start/stops may leak resources or just overwhelm - the single JVM context. + most unrelated to what is being tested. Medium Tests (((MediumTests))):: _Medium_ test cases are executed in separate JVM and individual test suites or test classes or in