svn commit: r1624177 - in /hive/trunk/itests: hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/ hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/

[jdere]

Author: jdere
Date: Thu Sep 11 01:13:02 2014
New Revision: 1624177

URL: http://svn.apache.org/r1624177
Log:
HIVE-8011: Fix couple of tests to work when FileSystem.access() is available 
(Jason Dere, reviewed by Thejas Nair)

Modified:
    
hive/trunk/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProviderWithACL.java
    
hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedClientSideAuthorizationProvider.java

Modified: 
hive/trunk/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProviderWithACL.java
URL: 
http://svn.apache.org/viewvc/hive/trunk/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProviderWithACL.java?rev=1624177&r1=1624176&r2=1624177&view=diff
==============================================================================
--- 
hive/trunk/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProviderWithACL.java
 (original)
+++ 
hive/trunk/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProviderWithACL.java
 Thu Sep 11 01:13:02 2014
@@ -154,11 +154,6 @@ public class TestStorageBasedMetastoreAu
     allowWriteAccessViaAcl(userName, warehouseDir.toString());
   }
 
-  protected void disallowCreateDatabase(String userName)
-      throws Exception {
-    disallowWriteAccessViaAcl(userName, warehouseDir.toString());
-  }
-
   @Override
   protected void allowCreateInDb(String dbName, String userName, String 
location)
       throws Exception {

Modified: 
hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedClientSideAuthorizationProvider.java
URL: 
http://svn.apache.org/viewvc/hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedClientSideAuthorizationProvider.java?rev=1624177&r1=1624176&r2=1624177&view=diff
==============================================================================
--- 
hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedClientSideAuthorizationProvider.java
 (original)
+++ 
hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedClientSideAuthorizationProvider.java
 Thu Sep 11 01:13:02 2014
@@ -85,7 +85,7 @@ public class TestStorageBasedClientSideA
   protected void assertNoPrivileges(CommandProcessorResponse ret){
     assertNotNull(ret);
     assertFalse(0 == ret.getResponseCode());
-    assertTrue(ret.getErrorMessage().indexOf("not permitted") != -1);
+    assertTrue(ret.getErrorMessage().indexOf("AccessControlException") != -1);
   }