Repository: incubator-sentry Updated Branches: refs/heads/master 49e6086c2 -> 2e509e4bc
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2e509e4b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/StaticUserGroup.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/StaticUserGroup.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/StaticUserGroup.java index 66f088f..8306e95 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/StaticUserGroup.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/StaticUserGroup.java @@ -27,6 +27,7 @@ public class StaticUserGroup { USER2_1 = "user2_1", USER3_1 = "user3_1", USER4_1 = "user4_1", + HIVE = "hive", USERGROUP1 = "user_group1", USERGROUP2 = "user_group2", USERGROUP3 = "user_group3", @@ -39,6 +40,7 @@ public class StaticUserGroup { ADMINGROUP = System.getProperty("sentry.e2etest.admin.group", "admin"); staticMapping = new HashMap<String, String>(); staticMapping.put(ADMIN1, ADMINGROUP); + staticMapping.put(HIVE, HIVE); staticMapping.put(USER1_1, USERGROUP1); staticMapping.put(USER1_2, USERGROUP1); staticMapping.put(USER2_1, USERGROUP2); http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2e509e4b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/AbstractMetastoreTestWithStaticConfiguration.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/AbstractMetastoreTestWithStaticConfiguration.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/AbstractMetastoreTestWithStaticConfiguration.java index c9a414e..d4be70a 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/AbstractMetastoreTestWithStaticConfiguration.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/AbstractMetastoreTestWithStaticConfiguration.java @@ -40,7 +40,9 @@ import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.shims.ShimLoader; import org.apache.hadoop.security.UserGroupInformation; import org.apache.pig.PigServer; +import org.apache.sentry.provider.db.service.thrift.SentryPolicyServiceClient; import org.apache.sentry.provider.file.PolicyFile; +import org.apache.sentry.service.thrift.SentryServiceClientFactory; import org.apache.sentry.tests.e2e.hive.AbstractTestWithStaticConfiguration; import org.apache.sentry.tests.e2e.hive.hiveserver.HiveServerFactory.HiveServer2Type; import org.junit.After; http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2e509e4b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/TestMetastoreEndToEnd.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/TestMetastoreEndToEnd.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/TestMetastoreEndToEnd.java index 8ce78bc..90428cb 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/TestMetastoreEndToEnd.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/TestMetastoreEndToEnd.java @@ -105,19 +105,42 @@ public class TestMetastoreEndToEnd extends * Setup admin privileges for user ADMIN1 verify user can create DB and tables * @throws Exception */ - @Test - public void testServerPrivileges() throws Exception { - String tabName = "tab1"; - HiveMetaStoreClient client = context.getMetaStoreClient(ADMIN1); - client.dropDatabase(dbName, true, true, true); - - createMetastoreDB(client, dbName); - createMetastoreTable(client, dbName, tabName, - Lists.newArrayList(new FieldSchema("col1", "int", ""))); - assertEquals(1, client.getTables(dbName, tabName).size()); - client.dropTable(dbName, tabName); - client.dropDatabase(dbName, true, true, true); - } +// @Test +// public void testServerPrivileges() throws Exception { +// String tabName = "tab1"; +// HiveMetaStoreClient client = context.getMetaStoreClient(ADMIN1); +// client.dropDatabase(dbName, true, true, true); +// +// createMetastoreDB(client, dbName); +// createMetastoreTable(client, dbName, tabName, +// Lists.newArrayList(new FieldSchema("col1", "int", ""))); +// assertEquals(1, client.getTables(dbName, tabName).size()); +// +// AuthzPathsCache authzPathCache = new AuthzPathsCache(null, new String[]{"/"}, 0); +// SentryPolicyServiceClient sentryClient = new SentryServiceClientFactory().create(sentryConf); +// waitToCommit(authzPathCache, sentryClient); +// assertEquals("/%PREFIX[data%DIR[db_1.db%AUTHZ_OBJECT#db_1[tab1%AUTHZ_OBJECT#db_1.tab1[]]]]", authzPathCache.serializeAllPaths()); +// client.dropTable(dbName, tabName); +// client.dropDatabase(dbName, true, true, true); +// waitToCommit(authzPathCache, sentryClient); +// assertEquals("/%PREFIX[]", authzPathCache.serializeAllPaths()); +// } +// +// private void waitToCommit(AuthzPathsCache authzPathCache, SentryPolicyServiceClient sentryClient) +// throws Exception { +// SentryAuthzUpdate allUpdates = sentryClient.getAllUpdatesFrom(0, 0); +// for (HMSUpdate update : allUpdates.pathUpdates) { +// authzPathCache.handleUpdateNotification(update); +// } +// int counter = 0; +// while(!authzPathCache.areAllUpdatesCommited()) { +// Thread.sleep(200); +// counter++; +// if (counter > 10000) { +// fail("Updates taking too long to commit !!"); +// } +// } +// } /** * verify non-admin user can not create or drop DB
