From dd2fc5334fd877b50922e1bcb72a182a78ad3c85 Mon Sep 17 00:00:00 2001 From: jxiang Date: Mon, 15 Jul 2013 18:07:57 +0000 Subject: [PATCH] HBASE-8662 [rest] support impersonation - ADDENDUM 2 git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1503387 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/hadoop/hbase/HBaseTestingUtility.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index cf477cbcf2a..1d5d1df1857 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -2096,7 +2096,12 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { */ public void waitTableAvailable(byte[] table) throws InterruptedException, IOException { - waitTableAvailable(table, 30000); + waitTableAvailable(getHBaseAdmin(), table, 30000); + } + + public void waitTableAvailable(HBaseAdmin admin, byte[] table) + throws InterruptedException, IOException { + waitTableAvailable(admin, table, 30000); } /** @@ -2107,9 +2112,14 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { * @throws IOException */ public void waitTableAvailable(byte[] table, long timeoutMillis) + throws InterruptedException, IOException { + waitTableAvailable(getHBaseAdmin(), table, timeoutMillis); + } + + public void waitTableAvailable(HBaseAdmin admin, byte[] table, long timeoutMillis) throws InterruptedException, IOException { long startWait = System.currentTimeMillis(); - while (!getHBaseAdmin().isTableAvailable(table)) { + while (!admin.isTableAvailable(table)) { assertTrue("Timed out waiting for table to become available " + Bytes.toStringBinary(table), System.currentTimeMillis() - startWait < timeoutMillis); @@ -2153,7 +2163,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { public void waitTableEnabled(HBaseAdmin admin, byte[] table, long timeoutMillis) throws InterruptedException, IOException { long startWait = System.currentTimeMillis(); - waitTableAvailable(table, timeoutMillis); + waitTableAvailable(admin, table, timeoutMillis); long remainder = System.currentTimeMillis() - startWait; while (!admin.isTableEnabled(table)) { assertTrue("Timed out waiting for table to become available and enabled " +