فهرست منبع

HADOOP-9375. Port HADOOP-7290 to branch-1 to fix TestUserGroupInformation failure. Contributed by Xiaobo Peng.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1453673 13f79535-47bb-0310-9956-ffa450edef68
Suresh Srinivas 12 سال پیش
والد
کامیت
f4ea24c59e
2فایلهای تغییر یافته به همراه7 افزوده شده و 4 حذف شده
  1. 3 0
      CHANGES.txt
  2. 4 4
      src/test/org/apache/hadoop/security/TestUserGroupInformation.java

+ 3 - 0
CHANGES.txt

@@ -523,6 +523,9 @@ Release 1.2.0 - unreleased
     HDFS-4544. Error in deleting blocks should not do check disk, for
     all types of errors. (Arpit Agarwal via suresh)
 
+    HADOOP-9375. Port HADOOP-7290 to branch-1 to fix TestUserGroupInformation
+    failure. (Xiaobo Peng via suresh)
+
 Release 1.1.2 - Unreleased
 
   INCOMPATIBLE CHANGES

+ 4 - 4
src/test/org/apache/hadoop/security/TestUserGroupInformation.java

@@ -28,9 +28,9 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 import javax.security.auth.login.AppConfigurationEntry;
 
@@ -117,7 +117,7 @@ public class TestUserGroupInformation {
     String line = br.readLine();
     System.out.println(userName + ":" + line);
    
-    List<String> groups = new ArrayList<String> ();    
+    Set<String> groups = new LinkedHashSet<String> ();    
     for(String s: line.split("[\\s]")) {
       groups.add(s);
     }
@@ -127,7 +127,7 @@ public class TestUserGroupInformation {
     String[] gi = login.getGroupNames();
     assertEquals(groups.size(), gi.length);
     for(int i=0; i < gi.length; i++) {
-      assertEquals(groups.get(i), gi[i]);
+      assertTrue(groups.contains(gi[i]));
     }
     
     final UserGroupInformation fakeUser =