Repository: sentry Updated Branches: refs/heads/master 72be6e755 -> 129f4ed9a
SENTRY-2094: Enable TestHDFSIntegrationWithHA tests (Sergio Pena, reviewed by Na Li) Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/129f4ed9 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/129f4ed9 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/129f4ed9 Branch: refs/heads/master Commit: 129f4ed9a9300c732f556d842a20f2ec1d1c188b Parents: 72be6e7 Author: Sergio Pena <sergio.p...@cloudera.com> Authored: Fri Dec 8 16:02:26 2017 -0600 Committer: Sergio Pena <sergio.p...@cloudera.com> Committed: Fri Dec 8 16:02:26 2017 -0600 ---------------------------------------------------------------------- sentry-tests/sentry-tests-hive-v2/pom.xml | 4 ---- sentry-tests/sentry-tests-hive/pom.xml | 4 ---- .../apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationEnd2End.java | 3 +-- .../apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationWithHA.java | 4 +--- 4 files changed, 2 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/129f4ed9/sentry-tests/sentry-tests-hive-v2/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive-v2/pom.xml b/sentry-tests/sentry-tests-hive-v2/pom.xml index 680481c..b129ed6 100644 --- a/sentry-tests/sentry-tests-hive-v2/pom.xml +++ b/sentry-tests/sentry-tests-hive-v2/pom.xml @@ -339,10 +339,6 @@ limitations under the License. <systemPropertyVariables> <buildDirectory>${project.build.directory}</buildDirectory> </systemPropertyVariables> - <excludes> - <exclude>**/TestHDFSIntegration.java</exclude> - <exclude>**/TestHDFSIntegrationWithHA.java</exclude> - </excludes> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/sentry/blob/129f4ed9/sentry-tests/sentry-tests-hive/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/pom.xml b/sentry-tests/sentry-tests-hive/pom.xml index 11b7917..6816249 100644 --- a/sentry-tests/sentry-tests-hive/pom.xml +++ b/sentry-tests/sentry-tests-hive/pom.xml @@ -344,10 +344,6 @@ limitations under the License. <systemPropertyVariables> <buildDirectory>${project.build.directory}</buildDirectory> </systemPropertyVariables> - <excludes> - <exclude>**/TestHDFSIntegration.java</exclude> - <exclude>**/TestHDFSIntegrationWithHA.java</exclude> - </excludes> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/sentry/blob/129f4ed9/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationEnd2End.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationEnd2End.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationEnd2End.java index 645fc35..a909b91 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationEnd2End.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationEnd2End.java @@ -223,8 +223,7 @@ public class TestHDFSIntegrationEnd2End extends TestHDFSIntegrationBase { stmt.execute("drop table ext101"); stmt.execute("use default"); stmt.execute("drop database extdb"); - - //TODO: SENTRY-795: HDFS permissions do not sync when Sentry restarts in HA mode. + if(!testSentryHA) { long beforeStop = System.currentTimeMillis(); sentryServer.stopAll(); http://git-wip-us.apache.org/repos/asf/sentry/blob/129f4ed9/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationWithHA.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationWithHA.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationWithHA.java index a911e2f..cc0449b 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationWithHA.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationWithHA.java @@ -18,10 +18,8 @@ package org.apache.sentry.tests.e2e.hdfs; import org.junit.BeforeClass; -import org.junit.Ignore; -@Ignore ("Disable sentry HA tests for now") -public class TestHDFSIntegrationWithHA extends TestHDFSIntegrationBase { +public class TestHDFSIntegrationWithHA extends TestHDFSIntegrationEnd2End { @BeforeClass public static void setup() throws Exception { TestHDFSIntegrationBase.testSentryHA = true;