From c9199095f86d76c3b76b8cb94067ae9fca57f54d Mon Sep 17 00:00:00 2001 From: Kihwal Lee Date: Mon, 22 Aug 2016 11:04:03 -0500 Subject: [PATCH] HDFS-10738. Fix TestRefreshUserMappings.testRefreshSuperUserGroupsConfiguration test failure. Contributed by Rakesh R. (cherry picked from commit 0f701f433dd3be233bf53e856864c82349e8274e) (cherry picked from commit 7f1879abe642219fce0328a8e96c983601d202b0) --- .../security/TestRefreshUserMappings.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java index c76033c4a56..ee20a9556aa 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java @@ -151,9 +151,13 @@ public class TestRefreshUserMappings { @Test public void testRefreshSuperUserGroupsConfiguration() throws Exception { final String SUPER_USER = "super_user"; - final String [] GROUP_NAMES1 = new String [] {"gr1" , "gr2"}; - final String [] GROUP_NAMES2 = new String [] {"gr3" , "gr4"}; - + final List groupNames1 = new ArrayList<>(); + groupNames1.add("gr1"); + groupNames1.add("gr2"); + final List groupNames2 = new ArrayList<>(); + groupNames2.add("gr3"); + groupNames2.add("gr4"); + //keys in conf String userKeyGroups = DefaultImpersonationProvider.getTestProvider(). getProxySuperuserGroupConfKey(SUPER_USER); @@ -178,12 +182,12 @@ public class TestRefreshUserMappings { when(ugi1.getUserName()).thenReturn("userL1"); when(ugi2.getUserName()).thenReturn("userL2"); - + // set groups for users - when(ugi1.getGroupNames()).thenReturn(GROUP_NAMES1); - when(ugi2.getGroupNames()).thenReturn(GROUP_NAMES2); - - + when(ugi1.getGroups()).thenReturn(groupNames1); + when(ugi2.getGroups()).thenReturn(groupNames2); + + // check before try { ProxyUsers.authorize(ugi1, "127.0.0.1");