Repository: sentry Updated Branches: refs/heads/master a53b20ad4 -> b72221b8d
SENTRY-1401: In V2, show role grant group groupname should not throw an exception if group doesnt exist in db (Ke Jia via Dapeng Sun) Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/b72221b8 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/b72221b8 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/b72221b8 Branch: refs/heads/master Commit: b72221b8dae93d9d1c50d7ce9a2f1192b39df34c Parents: a53b20a Author: Sun Dapeng <[email protected]> Authored: Thu Jul 14 10:23:10 2016 +0800 Committer: Sun Dapeng <[email protected]> Committed: Thu Jul 14 10:23:10 2016 +0800 ---------------------------------------------------------------------- .../tests/e2e/dbprovider/TestDatabaseProvider.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/b72221b8/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/dbprovider/TestDatabaseProvider.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/dbprovider/TestDatabaseProvider.java b/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/dbprovider/TestDatabaseProvider.java index 0012a8a..8cfd0d0 100644 --- a/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/dbprovider/TestDatabaseProvider.java +++ b/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/dbprovider/TestDatabaseProvider.java @@ -2019,8 +2019,19 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { expected.add(testRole1); assertTestRoles(resultSet, expected, false); - context.assertSentryException(statement, "SHOW ROLE GRANT GROUP Admin", - SentryNoSuchObjectException.class.getSimpleName()); + //context.assertSentryException(statement, "SHOW ROLE GRANT GROUP Admin", + //SentryNoSuchObjectException.class.getSimpleName()); + ResultSet res = statement.executeQuery("SHOW ROLE GRANT GROUP Admin"); + + List<String> expectedResult = new ArrayList<String>(); + List<String> returnedResult = new ArrayList<String>(); + + while (res.next()) { + returnedResult.add(res.getString(1).trim()); + } + validateReturnedResult(expectedResult, returnedResult); + returnedResult.clear(); + expectedResult.clear(); statement.close(); connection.close();
