Repository: incubator-sentry
Updated Branches:
  refs/heads/master b08717243 -> c53934070


http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c5393407/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSandboxOps.java
----------------------------------------------------------------------
diff --git 
a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSandboxOps.java
 
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSandboxOps.java
index a71856f..0d6e0b6 100644
--- 
a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSandboxOps.java
+++ 
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSandboxOps.java
@@ -29,15 +29,13 @@ import java.sql.Statement;
 import org.apache.hadoop.fs.Path;
 import org.apache.sentry.provider.file.PolicyFile;
 import org.apache.sentry.provider.file.PolicyFiles;
-import org.apache.sentry.tests.e2e.dbprovider.PolicyProviderForTest;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.google.common.io.Resources;
 
 public class TestSandboxOps  extends AbstractTestWithStaticConfiguration {
-  private PolicyProviderForTest policyFile;
+  private PolicyFile policyFile;
   private File dataFile;
   private String loadData;
   private static final String DB2_POLICY_FILE = "db2-policy-file.ini";
@@ -45,22 +43,14 @@ public class TestSandboxOps  extends 
AbstractTestWithStaticConfiguration {
 
   @Before
   public void setup() throws Exception {
-    context = createContext();
     dataFile = new File(dataDir, SINGLE_TYPE_DATA_FILE_NAME);
     FileOutputStream to = new FileOutputStream(dataFile);
     Resources.copy(Resources.getResource(SINGLE_TYPE_DATA_FILE_NAME), to);
     to.close();
-    policyFile = PolicyProviderForTest.setAdminOnServer1(ADMINGROUP);
+    policyFile = PolicyFile.setAdminOnServer1(ADMINGROUP);
     loadData = "server=server1->uri=file://" + dataFile.getPath();
   }
 
-  @After
-  public void tearDown() throws Exception {
-    if (context != null) {
-      context.close();
-    }
-  }
-
   private PolicyFile addTwoUsersWithAllDb() throws Exception {
     policyFile
     .addPermissionsToRole("db1_all", "server=server1->db=db1")

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c5393407/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java
----------------------------------------------------------------------
diff --git 
a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java
 
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java
index a12c9c5..5a620ba 100644
--- 
a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java
+++ 
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java
@@ -25,38 +25,27 @@ import java.sql.Statement;
 import com.google.common.io.Resources;
 import junit.framework.Assert;
 
-import org.apache.sentry.tests.e2e.dbprovider.PolicyProviderForTest;
+import org.apache.sentry.provider.file.PolicyFile;
 import org.apache.sentry.tests.e2e.hive.hiveserver.HiveServerFactory;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 public class TestUriPermissions extends AbstractTestWithStaticConfiguration {
-  private Context context;
-  private PolicyProviderForTest policyFile;
+  private PolicyFile policyFile;
   private File dataFile;
   private String loadData;
 
   @Before
   public void setup() throws Exception {
-    context = createContext();
-    policyFile = PolicyProviderForTest.setAdminOnServer1(ADMINGROUP);
     dataFile = new File(dataDir, SINGLE_TYPE_DATA_FILE_NAME);
     FileOutputStream to = new FileOutputStream(dataFile);
     Resources.copy(Resources.getResource(SINGLE_TYPE_DATA_FILE_NAME), to);
     to.close();
-    policyFile = PolicyProviderForTest.setAdminOnServer1(ADMINGROUP);
+    policyFile = PolicyFile.setAdminOnServer1(ADMINGROUP);
     loadData = "server=server1->uri=file://" + dataFile.getPath();
 
   }
 
-  @After
-  public void tearDown() throws Exception {
-    if (context != null) {
-      context.close();
-    }
-  }
-
   // test load data into table
   @Test
   public void testLoadPrivileges() throws Exception {
@@ -88,7 +77,7 @@ public class TestUriPermissions extends 
AbstractTestWithStaticConfiguration {
     userConn = context.createConnection(USER1_1);
     userStmt = context.createStatement(userConn);
     userStmt.execute("use " + dbName);
-    userStmt.execute("load data local inpath 'file://" + dataFile.toString() +
+    userStmt.execute("load data local inpath 'file://" + dataFile.getPath() +
         "' into table " + tabName);
     userStmt.execute("select * from " + tabName + " limit 1");
     ResultSet res = userStmt.getResultSet();
@@ -100,7 +89,7 @@ public class TestUriPermissions extends 
AbstractTestWithStaticConfiguration {
     userConn = context.createConnection(USER2_1);
     userStmt = context.createStatement(userConn);
     userStmt.execute("use " + dbName);
-    context.assertAuthzException(userStmt, "load data local inpath '" + 
dataFile.toString() +
+    context.assertAuthzException(userStmt, "load data local inpath 'file://" + 
dataFile.getPath() +
         "' into table " + tabName);
     userStmt.close();
     userConn.close();

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c5393407/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUserManagement.java
----------------------------------------------------------------------
diff --git 
a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUserManagement.java
 
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUserManagement.java
index a985e64..739c7ea 100644
--- 
a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUserManagement.java
+++ 
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUserManagement.java
@@ -17,6 +17,8 @@
 
 package org.apache.sentry.tests.e2e.hive;
 
+import org.apache.sentry.provider.file.PolicyFile;
+import org.junit.After;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -27,8 +29,6 @@ import java.sql.ResultSet;
 import java.sql.Statement;
 
 import org.apache.hadoop.mapreduce.JobContext;
-import org.apache.sentry.tests.e2e.dbprovider.PolicyProviderForTest;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -40,24 +40,23 @@ public class TestUserManagement extends 
AbstractTestWithStaticConfiguration {
   private static final String tableName = "t1";
   private static final String tableComment = "Test table";
   private File dataFile;
-  private Context context;
-  private PolicyProviderForTest policyFile;
+  private PolicyFile policyFile;
 
   @Before
   public void setUp() throws Exception {
-    context = createContext();
     dataFile = new File(dataDir, SINGLE_TYPE_DATA_FILE_NAME);
     FileOutputStream to = new FileOutputStream(dataFile);
     Resources.copy(Resources.getResource(SINGLE_TYPE_DATA_FILE_NAME), to);
     to.close();
   }
-
+  @Override
   @After
-  public void tearDown() throws Exception {
+  public void clearDB() throws Exception {
     if (context != null) {
       context.close();
     }
   }
+
   private void doCreateDbLoadDataDropDb(String admin, String...users) throws 
Exception {
     doDropDb(admin);
     for (String user : users) {
@@ -109,7 +108,7 @@ public class TestUserManagement extends 
AbstractTestWithStaticConfiguration {
    */
   @Test
   public void testSanity() throws Exception {
-    policyFile = PolicyProviderForTest.setAdminOnServer1(ADMINGROUP);
+    policyFile = PolicyFile.setAdminOnServer1(ADMINGROUP);
     policyFile
         .addGroupsToUser("admin1", ADMINGROUP);
     writePolicyFile(policyFile);
@@ -121,7 +120,7 @@ public class TestUserManagement extends 
AbstractTestWithStaticConfiguration {
    **/
   @Test
   public void testAdmin1() throws Exception {
-    policyFile = PolicyProviderForTest.setAdminOnServer1(ADMINGROUP);
+    policyFile = PolicyFile.setAdminOnServer1(ADMINGROUP);
     policyFile
         .addGroupsToUser("admin1", ADMINGROUP)
         .addGroupsToUser("admin2", ADMINGROUP)
@@ -137,7 +136,7 @@ public class TestUserManagement extends 
AbstractTestWithStaticConfiguration {
    **/
   @Test
   public void testAdmin3() throws Exception {
-    policyFile = PolicyProviderForTest.setAdminOnServer1(ADMINGROUP);
+    policyFile = PolicyFile.setAdminOnServer1(ADMINGROUP);
     policyFile
         .addGroupsToUser("admin1", ADMINGROUP)
         .addGroupsToUser("admin2", ADMINGROUP)
@@ -162,7 +161,7 @@ public class TestUserManagement extends 
AbstractTestWithStaticConfiguration {
    **/
   @Test
   public void testAdmin5() throws Exception {
-    policyFile = new PolicyProviderForTest();
+    policyFile = new PolicyFile();
     policyFile
         .addRolesToGroup("admin_group1", ADMINGROUP)
         .addRolesToGroup("admin_group2", ADMINGROUP)
@@ -179,7 +178,7 @@ public class TestUserManagement extends 
AbstractTestWithStaticConfiguration {
    **/
   @Test
   public void testAdmin6() throws Exception {
-    policyFile = PolicyProviderForTest.setAdminOnServer1(ADMINGROUP);
+    policyFile = PolicyFile.setAdminOnServer1(ADMINGROUP);
     policyFile
         .addGroupsToUser("admin1", ADMINGROUP)
         .addRolesToGroup("group1", "non_admin_role")
@@ -200,7 +199,7 @@ public class TestUserManagement extends 
AbstractTestWithStaticConfiguration {
    **/
   @Test
   public void testGroup2() throws Exception {
-    policyFile = new PolicyProviderForTest();
+    policyFile = new PolicyFile();
     policyFile
         .addRolesToGroup("group1", ADMINGROUP, "analytics")
         .addPermissionsToRole(ADMINGROUP, "server=server1")
@@ -216,7 +215,7 @@ public class TestUserManagement extends 
AbstractTestWithStaticConfiguration {
    **/
   @Test
   public void testGroup4() throws Exception {
-    policyFile = PolicyProviderForTest.setAdminOnServer1(ADMINGROUP);
+    policyFile = PolicyFile.setAdminOnServer1(ADMINGROUP);
     policyFile
         .addGroupsToUser("admin1", ADMINGROUP)
         .addRolesToGroup("group1", "non_admin_role", "load_data")
@@ -249,7 +248,7 @@ public class TestUserManagement extends 
AbstractTestWithStaticConfiguration {
   @Test
   public void testGroup5() throws Exception {
 
-    policyFile = PolicyProviderForTest.setAdminOnServer1(ADMINGROUP);
+    policyFile = PolicyFile.setAdminOnServer1(ADMINGROUP);
     policyFile
         .addGroupsToUser("admin1", ADMINGROUP)
         .addRolesToGroup("group1", "non_admin_role", "load_data")
@@ -273,7 +272,7 @@ public class TestUserManagement extends 
AbstractTestWithStaticConfiguration {
    **/
   @Test
   public void testGroup6() throws Exception {
-    policyFile = PolicyProviderForTest.setAdminOnServer1(ADMINGROUP);
+    policyFile = PolicyFile.setAdminOnServer1(ADMINGROUP);
     policyFile
         .addGroupsToUser("admin1", ADMINGROUP)
         .addRolesToGroup("group1~!@#$%^&*()+-", "analytics", "load_data")
@@ -297,7 +296,7 @@ public class TestUserManagement extends 
AbstractTestWithStaticConfiguration {
    **/
   @Test
   public void testGroup7() throws Exception {
-    policyFile = new PolicyProviderForTest();
+    policyFile = new PolicyFile();
     policyFile
         .addRolesToGroup("group1", ADMINGROUP)
         .addPermissionsToRole(ADMINGROUP, "server=server1")
@@ -313,7 +312,7 @@ public class TestUserManagement extends 
AbstractTestWithStaticConfiguration {
    **/
   @Test
   public void testGroup8() throws Exception {
-    policyFile = PolicyProviderForTest.setAdminOnServer1(ADMINGROUP);
+    policyFile = PolicyFile.setAdminOnServer1(ADMINGROUP);
     policyFile
         .addGroupsToUser("admin1", ADMINGROUP)
         .addRolesToGroup("group1", "analytics")

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c5393407/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/fs/ClusterDFS.java
----------------------------------------------------------------------
diff --git 
a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/fs/ClusterDFS.java
 
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/fs/ClusterDFS.java
index a16bb38..06415cb 100644
--- 
a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/fs/ClusterDFS.java
+++ 
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/fs/ClusterDFS.java
@@ -37,6 +37,7 @@ public class ClusterDFS extends AbstractDFS{
   ClusterDFS() throws Exception{
     ugi = UserGroupInformation.loginUserFromKeytabAndReturnUGI(testUser, 
KEYTAB_LOCATION + "/" + testUser + ".keytab");
     fileSystem = getFS(ugi);
+    LOGGER.info("File system uri for policy files: " + fileSystem.getUri());
     LOGGER.info("Creating basedir as user : " + testUser);
     String policyDir = 
System.getProperty("sentry.e2etest.hive.policy.location", "/user/hive/sentry");
     sentryDir = super.assertCreateDfsDir(new Path(fileSystem.getUri() + 
policyDir));

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c5393407/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/hiveserver/HiveServerFactory.java
----------------------------------------------------------------------
diff --git 
a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/hiveserver/HiveServerFactory.java
 
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/hiveserver/HiveServerFactory.java
index c0dc939..0165806 100644
--- 
a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/hiveserver/HiveServerFactory.java
+++ 
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/hiveserver/HiveServerFactory.java
@@ -163,6 +163,7 @@ public class HiveServerFactory {
       Assert.fail("Path to hadoop bin " + hadoopBin.getPath() + " is invalid. "
           + "Perhaps you missed the download-hadoop profile.");
     }
+
     /*
      * This hack, setting the hiveSiteURL field removes a previous hack 
involving
      * setting of system properties for each property. Although both are hacks,

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c5393407/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/hiveserver/UnmanagedHiveServer.java
----------------------------------------------------------------------
diff --git 
a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/hiveserver/UnmanagedHiveServer.java
 
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/hiveserver/UnmanagedHiveServer.java
index 42a274f..e8b3a2a 100644
--- 
a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/hiveserver/UnmanagedHiveServer.java
+++ 
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/hiveserver/UnmanagedHiveServer.java
@@ -108,5 +108,6 @@ public class UnmanagedHiveServer implements HiveServer {
   }
   public void kinit(String user) throws Exception{
     UserGroupInformation.loginUserFromKeytab(user, KEYTAB_LOCATION + "/" + 
user + ".keytab");
+    LOGGER.info("Kinited user: "+ user+" keytab: 
"+KEYTAB_LOCATION+"/"+user+".keytab");
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c5393407/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 fe10f5d..7084400 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
@@ -38,7 +38,6 @@ 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.tests.e2e.dbprovider.PolicyProviderForTest;
 import org.apache.sentry.tests.e2e.hive.AbstractTestWithStaticConfiguration;
 import 
org.apache.sentry.tests.e2e.hive.hiveserver.HiveServerFactory.HiveServer2Type;
 import org.junit.BeforeClass;
@@ -51,8 +50,6 @@ public abstract class 
AbstractMetastoreTestWithStaticConfiguration extends
     useSentryService = true;
     testServerType = HiveServer2Type.InternalMetastore.name();
     AbstractTestWithStaticConfiguration.setupTestStaticConfiguration();
-    PolicyProviderForTest.setSentryClient(AbstractTestWithStaticConfiguration
-        .getSentryClient());
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c5393407/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/TestMetaStoreWithPigHCat.java
----------------------------------------------------------------------
diff --git 
a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/TestMetaStoreWithPigHCat.java
 
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/TestMetaStoreWithPigHCat.java
index 46feace..8a2bf59 100644
--- 
a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/TestMetaStoreWithPigHCat.java
+++ 
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/TestMetaStoreWithPigHCat.java
@@ -18,6 +18,7 @@
 
 package org.apache.sentry.tests.e2e.metastore;
 
+import org.apache.sentry.provider.file.PolicyFile;
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
@@ -28,7 +29,6 @@ import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
 import org.apache.hive.hcatalog.pig.HCatStorer;
 import org.apache.pig.ExecType;
 import org.apache.pig.PigServer;
-import org.apache.sentry.tests.e2e.dbprovider.PolicyProviderForTest;
 import org.apache.sentry.tests.e2e.hive.Context;
 import org.apache.sentry.tests.e2e.hive.StaticUserGroup;
 import org.junit.Before;
@@ -38,7 +38,7 @@ import com.google.common.io.Resources;
 
 public class TestMetaStoreWithPigHCat extends
     AbstractMetastoreTestWithStaticConfiguration {
-  private PolicyProviderForTest policyFile;
+  private PolicyFile policyFile;
   private File dataFile;
   private static final String dbName = "db_1";
   private static final String db_all_role = "all_db1";
@@ -46,13 +46,12 @@ public class TestMetaStoreWithPigHCat extends
 
   @Before
   public void setup() throws Exception {
-    context = createContext();
     dataFile = new File(dataDir, SINGLE_TYPE_DATA_FILE_NAME);
     FileOutputStream to = new FileOutputStream(dataFile);
     Resources.copy(Resources.getResource(SINGLE_TYPE_DATA_FILE_NAME), to);
     to.close();
 
-    policyFile = PolicyProviderForTest.setAdminOnServer1(ADMINGROUP);
+    policyFile = PolicyFile.setAdminOnServer1(ADMINGROUP);
     policyFile
         .addRolesToGroup(USERGROUP1, db_all_role)
         .addRolesToGroup(USERGROUP2, "read_db_role")

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c5393407/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 1aed84d..c672ef0 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
@@ -18,6 +18,7 @@
 
 package org.apache.sentry.tests.e2e.metastore;
 
+import org.apache.sentry.provider.file.PolicyFile;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
@@ -29,7 +30,6 @@ import org.apache.hadoop.hive.metastore.api.FieldSchema;
 import org.apache.hadoop.hive.metastore.api.MetaException;
 import org.apache.hadoop.hive.metastore.api.Partition;
 import org.apache.hadoop.hive.metastore.api.Table;
-import org.apache.sentry.tests.e2e.dbprovider.PolicyProviderForTest;
 import org.apache.sentry.tests.e2e.hive.Context;
 import org.apache.sentry.tests.e2e.hive.StaticUserGroup;
 import org.apache.sentry.tests.e2e.hive.hiveserver.HiveServerFactory;
@@ -42,15 +42,14 @@ import com.google.common.collect.Lists;
 public class TestMetastoreEndToEnd extends
     AbstractMetastoreTestWithStaticConfiguration {
 
-  private PolicyProviderForTest policyFile;
+  private PolicyFile policyFile;
   private static final String dbName = "db_1";
   private static final String db_all_role = "all_db1";
   private static final String uri_role = "uri_role";
 
   @Before
   public void setup() throws Exception {
-    context = createContext();
-    policyFile = PolicyProviderForTest.setAdminOnServer1(ADMINGROUP);
+    policyFile = PolicyFile.setAdminOnServer1(ADMINGROUP);
     policyFile
         .addRolesToGroup(USERGROUP1, db_all_role)
         .addRolesToGroup(USERGROUP2, "read_db_role")

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c5393407/sentry-tests/sentry-tests-hive/src/test/resources/core-site.xml
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/resources/core-site.xml 
b/sentry-tests/sentry-tests-hive/src/test/resources/core-site.xml
deleted file mode 100644
index 676dc12..0000000
--- a/sentry-tests/sentry-tests-hive/src/test/resources/core-site.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<configuration>
-  <property>
-    <name>fs.permissions</name>
-    <value>false</value>
-  </property>
-  <property>
-    <name>fs.permissions.umask-mode</name>
-    <value>000</value>
-  </property>
-  <property>
-    <name>hadoop.security.group.mapping</name>
-    
<value>org.apache.sentry.tests.e2e.hive.fs.MiniDFS$PseudoGroupMappingService</value>
-  </property>
-</configuration>

Reply via email to