You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2011/09/22 21:13:34 UTC
svn commit: r1174326 - in /hadoop/common/branches/branch-0.20-security: CHANGES.txt src/test/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java src/test/org/apache/hadoop/security/TestRefreshUserMappings.java

Author: jitendra
Date: Thu Sep 22 19:13:34 2011
New Revision: 1174326

URL: http://svn.apache.org/viewvc?rev=1174326&view=rev
Log:
HADOOP-7649. TestMapredGroupMappingServiceRefresh and TestRefreshUserMappings fail after HADOOP-7625.

Modified:
    hadoop/common/branches/branch-0.20-security/CHANGES.txt
    hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java
    hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/security/TestRefreshUserMappings.java

Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1174326&r1=1174325&r2=1174326&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Thu Sep 22 19:13:34 2011
@@ -212,6 +212,9 @@ Release 0.20.205.0 - unreleased
     HADOOP-7661. FileSystem.getCanonicalServiceName throws NPE for any 
     file system uri that doesn't have an authority. (jitendra)
 
+    HADOOP-7649. TestMapredGroupMappingServiceRefresh and 
+    TestRefreshUserMappings fail after HADOOP-7625. (jitendra)
+
   IMPROVEMENTS
 
     MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via

Modified: hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java?rev=1174326&r1=1174325&r2=1174326&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java Thu Sep 22 19:13:34 2011
@@ -246,9 +246,8 @@ public class TestMapredGroupMappingServi
   private void addNewConfigResource(String rsrcName, String keyGroup,
       String groups, String keyHosts, String hosts)  throws FileNotFoundException {
     // location for temp resource should be in CLASSPATH
-    URL url = config.getResource("mapred-default.xml");
-    Path p = new Path(url.getPath());
-    Path dir = p.getParent();
+    String dir = System.getProperty("test.build.extraconf", 
+        "build/test/extraconf");
     tempResource = dir.toString() + "/" + rsrcName;
 
 

Modified: hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/security/TestRefreshUserMappings.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/security/TestRefreshUserMappings.java?rev=1174326&r1=1174325&r2=1174326&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/security/TestRefreshUserMappings.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/security/TestRefreshUserMappings.java Thu Sep 22 19:13:34 2011
@@ -227,10 +227,8 @@ public class TestRefreshUserMappings {
   private void addNewConfigResource(String rsrcName, String keyGroup,
       String groups, String keyHosts, String hosts)  throws FileNotFoundException {
     // location for temp resource should be in CLASSPATH
-    Configuration conf = new Configuration();
-    URL url = conf.getResource("hdfs-default.xml");
-    Path p = new Path(url.getPath());
-    Path dir = p.getParent();
+    String dir = System.getProperty("test.build.extraconf", 
+        "build/test/extraconf");
     tempResource = dir.toString() + "/" + rsrcName;