hbase git commit: HBASE-14698 Set category timeouts on TestScanner and TestNamespaceAuditor

2015-10-26 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 dcce2ed09 -> f7ead928c


HBASE-14698 Set category timeouts on TestScanner and TestNamespaceAuditor


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f7ead928
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f7ead928
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f7ead928

Branch: refs/heads/branch-1.2
Commit: f7ead928c0e030d491abf91da69c5724f7c9c225
Parents: dcce2ed
Author: stack 
Authored: Mon Oct 26 12:55:36 2015 -0700
Committer: stack 
Committed: Mon Oct 26 12:55:46 2015 -0700

--
 .../hbase/io/encoding/TestDataBlockEncoders.java |  5 +
 .../hbase/namespace/TestNamespaceAuditor.java| 19 ---
 .../hadoop/hbase/regionserver/TestScanner.java   |  5 +
 .../snapshot/TestFlushSnapshotFromClient.java|  3 +--
 4 files changed, 19 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f7ead928/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
index 4170b44..c9107e3 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
@@ -31,20 +31,17 @@ import java.util.List;
 import java.util.Random;
 
 import org.apache.hadoop.hbase.CategoryBasedTimeout;
-import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellComparator;
-import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.KeyValue.Type;
 import org.apache.hadoop.hbase.KeyValueUtil;
-import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.Tag;
 import org.apache.hadoop.hbase.io.compress.Compression;
 import 
org.apache.hadoop.hbase.io.hfile.HFileBlock.Writer.BufferGrabbingByteArrayOutputStream;
 import org.apache.hadoop.hbase.io.hfile.HFileContext;
 import org.apache.hadoop.hbase.io.hfile.HFileContextBuilder;
+import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.test.RedundantKVGenerator;
 import org.junit.Rule;

http://git-wip-us.apache.org/repos/asf/hbase/blob/f7ead928/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
index 773bdab..b6fab17 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
@@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.CategoryBasedTimeout;
 import org.apache.hadoop.hbase.Coprocessor;
 import org.apache.hadoop.hbase.CoprocessorEnvironment;
 import org.apache.hadoop.hbase.DoNotRetryIOException;
@@ -78,13 +79,17 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.junit.rules.TestRule;
 
 import com.google.common.collect.Sets;
 
 @Category(MediumTests.class)
 public class TestNamespaceAuditor {
+  @Rule public final TestRule timeout = CategoryBasedTimeout.builder().
+  withTimeout(this.getClass()).withLookingForStuckThread(true).build();
   private static final Log LOG = LogFactory.getLog(TestNamespaceAuditor.class);
   private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
   private static HBaseAdmin ADMIN;
@@ -129,7 +134,7 @@ public class TestNamespaceAuditor {
 .getMasterQuotaManager().isQuotaEnabled());
   }
 
-  @Test(timeout = 6)
+  @Test
   public void testTableOperations() throws Exception {
 String nsp = prefix + "_np2";
 NamespaceDescriptor nspDesc =
@@ -487,7 +492,7 @@ public class TestNamespaceAuditor {
* namespace quota cache. Now correct the failure and recreate the table 
with same name.
* HBASE-13394
*/
-  @Test(timeout = 18

hbase git commit: HBASE-14698 Set category timeouts on TestScanner and TestNamespaceAuditor

2015-10-26 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 ec021a7b2 -> 0c5f4e01f


HBASE-14698 Set category timeouts on TestScanner and TestNamespaceAuditor


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0c5f4e01
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0c5f4e01
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0c5f4e01

Branch: refs/heads/branch-1
Commit: 0c5f4e01f64c3efe670a50a57cd0f73133089b88
Parents: ec021a7
Author: stack 
Authored: Mon Oct 26 12:55:36 2015 -0700
Committer: stack 
Committed: Mon Oct 26 12:56:14 2015 -0700

--
 .../hbase/io/encoding/TestDataBlockEncoders.java |  5 +
 .../hbase/namespace/TestNamespaceAuditor.java| 19 ---
 .../hadoop/hbase/regionserver/TestScanner.java   |  5 +
 .../snapshot/TestFlushSnapshotFromClient.java|  3 +--
 4 files changed, 19 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/0c5f4e01/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
index 4170b44..c9107e3 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
@@ -31,20 +31,17 @@ import java.util.List;
 import java.util.Random;
 
 import org.apache.hadoop.hbase.CategoryBasedTimeout;
-import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellComparator;
-import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.KeyValue.Type;
 import org.apache.hadoop.hbase.KeyValueUtil;
-import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.Tag;
 import org.apache.hadoop.hbase.io.compress.Compression;
 import 
org.apache.hadoop.hbase.io.hfile.HFileBlock.Writer.BufferGrabbingByteArrayOutputStream;
 import org.apache.hadoop.hbase.io.hfile.HFileContext;
 import org.apache.hadoop.hbase.io.hfile.HFileContextBuilder;
+import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.test.RedundantKVGenerator;
 import org.junit.Rule;

http://git-wip-us.apache.org/repos/asf/hbase/blob/0c5f4e01/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
index 773bdab..b6fab17 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
@@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.CategoryBasedTimeout;
 import org.apache.hadoop.hbase.Coprocessor;
 import org.apache.hadoop.hbase.CoprocessorEnvironment;
 import org.apache.hadoop.hbase.DoNotRetryIOException;
@@ -78,13 +79,17 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.junit.rules.TestRule;
 
 import com.google.common.collect.Sets;
 
 @Category(MediumTests.class)
 public class TestNamespaceAuditor {
+  @Rule public final TestRule timeout = CategoryBasedTimeout.builder().
+  withTimeout(this.getClass()).withLookingForStuckThread(true).build();
   private static final Log LOG = LogFactory.getLog(TestNamespaceAuditor.class);
   private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
   private static HBaseAdmin ADMIN;
@@ -129,7 +134,7 @@ public class TestNamespaceAuditor {
 .getMasterQuotaManager().isQuotaEnabled());
   }
 
-  @Test(timeout = 6)
+  @Test
   public void testTableOperations() throws Exception {
 String nsp = prefix + "_np2";
 NamespaceDescriptor nspDesc =
@@ -487,7 +492,7 @@ public class TestNamespaceAuditor {
* namespace quota cache. Now correct the failure and recreate the table 
with same name.
* HBASE-13394
*/
-  @Test(timeout = 18)
+

hbase git commit: HBASE-14698 Set category timeouts on TestScanner and TestNamespaceAuditor

2015-10-26 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/master 4c04e8065 -> 0f6ec611e


HBASE-14698 Set category timeouts on TestScanner and TestNamespaceAuditor


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0f6ec611
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0f6ec611
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0f6ec611

Branch: refs/heads/master
Commit: 0f6ec611e653eec03cd3d2c516cbfcb202090916
Parents: 4c04e80
Author: stack 
Authored: Mon Oct 26 12:55:36 2015 -0700
Committer: stack 
Committed: Mon Oct 26 13:05:58 2015 -0700

--
 .../hbase/io/encoding/TestDataBlockEncoders.java |  3 ---
 .../hbase/namespace/TestNamespaceAuditor.java| 19 ---
 .../hadoop/hbase/regionserver/TestScanner.java   |  5 +
 3 files changed, 17 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/0f6ec611/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
index 2e9e973..9863fac 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
@@ -32,9 +32,6 @@ import java.util.List;
 import java.util.Random;
 
 import org.apache.hadoop.hbase.CategoryBasedTimeout;
-import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellComparator;
-import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.KeyValue;

http://git-wip-us.apache.org/repos/asf/hbase/blob/0f6ec611/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
index 9912808..41a9713 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
@@ -37,6 +37,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.CategoryBasedTimeout;
 import org.apache.hadoop.hbase.Coprocessor;
 import org.apache.hadoop.hbase.CoprocessorEnvironment;
 import org.apache.hadoop.hbase.DoNotRetryIOException;
@@ -85,13 +86,17 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.junit.rules.TestRule;
 
 import com.google.common.collect.Sets;
 
 @Category(MediumTests.class)
 public class TestNamespaceAuditor {
+  @Rule public final TestRule timeout = CategoryBasedTimeout.builder().
+  withTimeout(this.getClass()).withLookingForStuckThread(true).build();
   private static final Log LOG = LogFactory.getLog(TestNamespaceAuditor.class);
   private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
   private static HBaseAdmin ADMIN;
@@ -133,7 +138,7 @@ public class TestNamespaceAuditor {
   .getMasterQuotaManager().isQuotaEnabled());
   }
 
-  @Test(timeout = 6)
+  @Test
   public void testTableOperations() throws Exception {
 String nsp = prefix + "_np2";
 NamespaceDescriptor nspDesc =
@@ -480,7 +485,7 @@ public class TestNamespaceAuditor {
* namespace quota cache. Now correct the failure and recreate the table 
with same name.
* HBASE-13394
*/
-  @Test(timeout = 18)
+  @Test
   public void testRecreateTableWithSameNameAfterFirstTimeFailure() throws 
Exception {
 String nsp1 = prefix + "_testRecreateTable";
 NamespaceDescriptor nspDesc =
@@ -659,7 +664,7 @@ public class TestNamespaceAuditor {
 observer.tableDeletionLatch.await();
   }
 
-  @Test(expected = QuotaExceededException.class, timeout = 3)
+  @Test(expected = QuotaExceededException.class)
   public void testExceedTableQuotaInNamespace() throws Exception {
 String nsp = prefix + "_testExceedTableQuotaInNamespace";
 NamespaceDescriptor nspDesc =
@@ -676,7 +681,7 @@ public class TestNamespaceAuditor {
 ADMIN.createTable(tableDescTwo, Bytes.toBytes("AAA"), 
Bytes.toBytes("ZZZ"), 4);
   }
   
-  @Test(

hbase git commit: HBASE-14698 Set category timeouts on TestScanner and TestNamespaceAuditor; ADDENDUM

2015-10-26 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/master 0f6ec611e -> d0944f821


  HBASE-14698 Set category timeouts on TestScanner and TestNamespaceAuditor; 
ADDENDUM


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d0944f82
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d0944f82
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d0944f82

Branch: refs/heads/master
Commit: d0944f8219c4258f948e7470419ae683cc4194db
Parents: 0f6ec61
Author: stack 
Authored: Mon Oct 26 13:28:41 2015 -0700
Committer: stack 
Committed: Mon Oct 26 13:28:41 2015 -0700

--
 .../apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java| 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d0944f82/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
index 9863fac..64c74e8 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
@@ -34,6 +34,9 @@ import java.util.Random;
 import org.apache.hadoop.hbase.CategoryBasedTimeout;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.CellComparator;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.KeyValue.Type;
 import org.apache.hadoop.hbase.KeyValueUtil;

[02/17] hbase git commit: HBASE-14698 Set category timeouts on TestScanner and TestNamespaceAuditor

2015-10-27 Thread syuanjiang 
HBASE-14698 Set category timeouts on TestScanner and TestNamespaceAuditor


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0f6ec611
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0f6ec611
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0f6ec611

Branch: refs/heads/hbase-12439
Commit: 0f6ec611e653eec03cd3d2c516cbfcb202090916
Parents: 4c04e80
Author: stack 
Authored: Mon Oct 26 12:55:36 2015 -0700
Committer: stack 
Committed: Mon Oct 26 13:05:58 2015 -0700

--
 .../hbase/io/encoding/TestDataBlockEncoders.java |  3 ---
 .../hbase/namespace/TestNamespaceAuditor.java| 19 ---
 .../hadoop/hbase/regionserver/TestScanner.java   |  5 +
 3 files changed, 17 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/0f6ec611/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
index 2e9e973..9863fac 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
@@ -32,9 +32,6 @@ import java.util.List;
 import java.util.Random;
 
 import org.apache.hadoop.hbase.CategoryBasedTimeout;
-import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellComparator;
-import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.KeyValue;

http://git-wip-us.apache.org/repos/asf/hbase/blob/0f6ec611/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
index 9912808..41a9713 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
@@ -37,6 +37,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.CategoryBasedTimeout;
 import org.apache.hadoop.hbase.Coprocessor;
 import org.apache.hadoop.hbase.CoprocessorEnvironment;
 import org.apache.hadoop.hbase.DoNotRetryIOException;
@@ -85,13 +86,17 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.junit.rules.TestRule;
 
 import com.google.common.collect.Sets;
 
 @Category(MediumTests.class)
 public class TestNamespaceAuditor {
+  @Rule public final TestRule timeout = CategoryBasedTimeout.builder().
+  withTimeout(this.getClass()).withLookingForStuckThread(true).build();
   private static final Log LOG = LogFactory.getLog(TestNamespaceAuditor.class);
   private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
   private static HBaseAdmin ADMIN;
@@ -133,7 +138,7 @@ public class TestNamespaceAuditor {
   .getMasterQuotaManager().isQuotaEnabled());
   }
 
-  @Test(timeout = 6)
+  @Test
   public void testTableOperations() throws Exception {
 String nsp = prefix + "_np2";
 NamespaceDescriptor nspDesc =
@@ -480,7 +485,7 @@ public class TestNamespaceAuditor {
* namespace quota cache. Now correct the failure and recreate the table 
with same name.
* HBASE-13394
*/
-  @Test(timeout = 18)
+  @Test
   public void testRecreateTableWithSameNameAfterFirstTimeFailure() throws 
Exception {
 String nsp1 = prefix + "_testRecreateTable";
 NamespaceDescriptor nspDesc =
@@ -659,7 +664,7 @@ public class TestNamespaceAuditor {
 observer.tableDeletionLatch.await();
   }
 
-  @Test(expected = QuotaExceededException.class, timeout = 3)
+  @Test(expected = QuotaExceededException.class)
   public void testExceedTableQuotaInNamespace() throws Exception {
 String nsp = prefix + "_testExceedTableQuotaInNamespace";
 NamespaceDescriptor nspDesc =
@@ -676,7 +681,7 @@ public class TestNamespaceAuditor {
 ADMIN.createTable(tableDescTwo, Bytes.toBytes("AAA"), 
Bytes.toBytes("ZZZ"), 4);
   }
   
-  @Test(expected = QuotaExceededException.class, timeout = 3)
+  @Test(expected

[03/17] hbase git commit: HBASE-14698 Set category timeouts on TestScanner and TestNamespaceAuditor; ADDENDUM

2015-10-27 Thread syuanjiang 
  HBASE-14698 Set category timeouts on TestScanner and TestNamespaceAuditor; 
ADDENDUM


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d0944f82
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d0944f82
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d0944f82

Branch: refs/heads/hbase-12439
Commit: d0944f8219c4258f948e7470419ae683cc4194db
Parents: 0f6ec61
Author: stack 
Authored: Mon Oct 26 13:28:41 2015 -0700
Committer: stack 
Committed: Mon Oct 26 13:28:41 2015 -0700

--
 .../apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java| 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d0944f82/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
index 9863fac..64c74e8 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
@@ -34,6 +34,9 @@ import java.util.Random;
 import org.apache.hadoop.hbase.CategoryBasedTimeout;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.CellComparator;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.KeyValue.Type;
 import org.apache.hadoop.hbase.KeyValueUtil;