HBASE-8964 TestAccessController.testGlobalAuthorizationForNewRegisteredRS; SECOND ATTEMPT

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1503964 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-07-17 00:54:11 +00:00
parent 658bac81e3
commit a75c904149
1 changed files with 5 additions and 5 deletions

View File

@ -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++;