CDH-54894: Fix the cherry-pick issues from SENTRY-1321 Change-Id: I785c8020f54502728220f1060d13ec1f73739256 Reviewed-on: http://gerrit.sjc.cloudera.com:8080/23476 Tested-by: Jenkins User Reviewed-by: Alexander Kolbasov <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/a26c6b47 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/a26c6b47 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/a26c6b47 Branch: refs/for/cdh5-1.5.1_ha Commit: a26c6b47d29c6c14ce8959b1f0347e9ede74b2fa Parents: d7e4c0b Author: Vamsee Yarlagadda <[email protected]> Authored: Mon Jun 5 20:15:28 2017 -0700 Committer: Alexander Kolbasov <[email protected]> Committed: Mon Jun 5 23:28:16 2017 -0700 ---------------------------------------------------------------------- .../generic/service/persistent/TestPrivilegeOperatePersistence.java | 1 - .../sentry/tests/e2e/dbprovider/TestDbPrivilegeCleanupOnDrop.java | 1 - 2 files changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/a26c6b47/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/generic/service/persistent/TestPrivilegeOperatePersistence.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/generic/service/persistent/TestPrivilegeOperatePersistence.java b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/generic/service/persistent/TestPrivilegeOperatePersistence.java index 5045cd3..3f3cb4c 100644 --- a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/generic/service/persistent/TestPrivilegeOperatePersistence.java +++ b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/generic/service/persistent/TestPrivilegeOperatePersistence.java @@ -47,7 +47,6 @@ import com.google.common.collect.Sets; * The test cases are used for search component The authorizables are COLLECTION and Field * The actions of search privilege are ALL,QUERY and UPDATE */ -@Ignore("Enable after fencing has been disabled - SENTRY-1478") public class TestPrivilegeOperatePersistence extends SentryStoreIntegrationBase { private static final String SEARCH = "solr"; private static final String ADMIN_USER = "solr"; http://git-wip-us.apache.org/repos/asf/sentry/blob/a26c6b47/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/dbprovider/TestDbPrivilegeCleanupOnDrop.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/dbprovider/TestDbPrivilegeCleanupOnDrop.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/dbprovider/TestDbPrivilegeCleanupOnDrop.java index c12aa81..3ac0179 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/dbprovider/TestDbPrivilegeCleanupOnDrop.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/dbprovider/TestDbPrivilegeCleanupOnDrop.java @@ -40,7 +40,6 @@ import com.google.common.io.Resources; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Ignore("Ignoring until SENTRY-1321 is complete") public class TestDbPrivilegeCleanupOnDrop extends AbstractTestWithStaticConfiguration { private static final Logger LOGGER = LoggerFactory
