diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java index 475dd8c..7a1935f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java @@ -503,9 +503,17 @@ public void testAdminAclsWithFileSystemBasedConfigurationProvider() String aclStringAfter = rm.adminService.getAccessControlList().getAclString().trim(); + // Since test depends on the arbitrary name of the user running the tests, + // there needs to be some work to ensure the proper order (alpahbetical) + String user = UserGroupInformation.getCurrentUser().getShortUserName(); + if (user.compareTo("world:anyone:rwcda") < 0) { + user = String.join(",", user, "world:anyone:rwcda"); + } else { + user = String.join(",", "world:anyone:rwcda", user); + } + Assert.assertTrue(!aclStringAfter.equals(aclStringBefore)); - Assert.assertEquals(aclStringAfter, "world:anyone:rwcda," + - UserGroupInformation.getCurrentUser().getShortUserName()); + Assert.assertEquals(user, aclStringAfter); } @Test @@ -1054,8 +1062,15 @@ public void testRMInitialsWithFileSystemBasedConfigurationProvider() String aclStringAfter = resourceManager.adminService.getAccessControlList() .getAclString().trim(); - Assert.assertEquals(aclStringAfter, "world:anyone:rwcda," + - UserGroupInformation.getCurrentUser().getShortUserName()); + + String user = UserGroupInformation.getCurrentUser().getShortUserName(); + if (user.compareTo("world:anyone:rwcda") < 0) { + user = String.join(",", user, "world:anyone:rwcda"); + } else { + user = String.join(",", "world:anyone:rwcda", user); + } + + Assert.assertEquals(aclStringAfter, user); // validate values for queue configuration CapacityScheduler cs = @@ -1143,7 +1158,7 @@ public void testRefreshAclWithDaemonUser() throws Exception { fail("Should not get any exceptions"); } - assertEquals(daemonUser + "xyz," + daemonUser, + assertEquals(String.join(",", daemonUser, daemonUser + "xyz"), rm.adminService.getAccessControlList().getAclString().trim()); yarnConf = new YarnConfiguration(); @@ -1159,7 +1174,7 @@ public void testRefreshAclWithDaemonUser() throws Exception { throw e; } - assertEquals(daemonUser + "abc," + daemonUser, + assertEquals(String.join(",", daemonUser, daemonUser + "abc"), rm.adminService.getAccessControlList().getAclString().trim()); }