svn commit: r1453673 - in /hadoop/common/branches/branch-1: CHANGES.txt src/test/org/apache/hadoop/security/TestUserGroupInformation.java

[su...@apache.org]

Author: suresh
Date: Thu Mar  7 03:13:37 2013
New Revision: 1453673

URL: http://svn.apache.org/r1453673
Log:
HADOOP-9375. Port HADOOP-7290 to branch-1 to fix TestUserGroupInformation failure. Contributed by Xiaobo Peng.

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestUserGroupInformation.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1453673&r1=1453672&r2=1453673&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Thu Mar  7 03:13:37 2013
@@ -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

Modified: hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestUserGroupInformation.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestUserGroupInformation.java?rev=1453673&r1=1453672&r2=1453673&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestUserGroupInformation.java (original)
+++ hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestUserGroupInformation.java Thu Mar  7 03:13:37 2013
@@ -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 =