svn commit: r1503964 - /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java

[st...@apache.org]

Author: stack
Date: Wed Jul 17 00:54:11 2013
New Revision: 1503964

URL: http://svn.apache.org/r1503964
Log:
HBASE-8964 TestAccessController.testGlobalAuthorizationForNewRegisteredRS; SECOND ATTEMPT

Modified:
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java?rev=1503964&r1=1503963&r2=1503964&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java Wed Jul 17 00:54:11 2013
@@ -154,7 +154,7 @@ public class TestAccessController {
       Coprocessor.PRIORITY_HIGHEST, 1, conf);
     RegionServerCoprocessorHost rsHost = TEST_UTIL.getMiniHBaseCluster().getRegionServer(0)
         .getCoprocessorHost();
-    RSCP_ENV = rsHost.createEnvironment(AccessController.class, ACCESS_CONTROLLER, 
+    RSCP_ENV = rsHost.createEnvironment(AccessController.class, ACCESS_CONTROLLER,
       Coprocessor.PRIORITY_HIGHEST, 1, conf);
 
     // Wait for the ACL table to become available
@@ -424,7 +424,7 @@ public class TestAccessController {
 
     verifyAllowed(disableTable, SUPERUSER, USER_ADMIN, USER_CREATE, USER_OWNER);
     verifyDenied(disableTable, USER_RW, USER_RO, USER_NONE);
-    
+
     // No user should be allowed to disable _acl_ table
     verifyDenied(disableAclTable, SUPERUSER, USER_ADMIN, USER_CREATE, USER_OWNER, USER_RW, USER_RO);
   }
@@ -620,7 +620,7 @@ public class TestAccessController {
     verifyDenied(action, USER_CREATE, USER_RW, USER_RO, USER_NONE);
   }
 
-  
+
   @Test
   public void testFlush() throws Exception {
     PrivilegedExceptionAction action = new PrivilegedExceptionAction() {
@@ -1936,7 +1936,7 @@ public class TestAccessController {
           + hbaseCluster.getLiveRegionServerThreads().size();
       ProtobufUtil.grant(protocol, activeUserForNewRs, null, null, null,
         Permission.Action.ADMIN, Permission.Action.CREATE,
-        Permission.Action.READ, Permission.Action.WRITE);      
+        Permission.Action.READ, Permission.Action.WRITE);
     } finally {
       acl.close();
     }
@@ -1974,7 +1974,7 @@ public class TestAccessController {
         LOG.debug("Waiting for region to be opened. Already retried " + retries
             + " times.");
         try {
-          Thread.sleep(200);
+          Thread.sleep(1000);
         } catch (InterruptedException e) {
         }
         retries++;