Repository: hadoop Updated Branches: refs/heads/branch-2.8 c8d494197 -> c5b1a8910
YARN-6461. TestRMAdminCLI has very low test timeouts. Contributed by Eric Badger (cherry picked from commit 90d97372ed11aaa95d338db8583f578da159834a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c5b1a891 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c5b1a891 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c5b1a891 Branch: refs/heads/branch-2.8 Commit: c5b1a8910dd6139c076fd59ac17d8644ae368663 Parents: c8d4941 Author: Jason Lowe <[email protected]> Authored: Tue Apr 11 09:16:11 2017 -0500 Committer: Jason Lowe <[email protected]> Committed: Tue Apr 11 09:18:56 2017 -0500 ---------------------------------------------------------------------- .../hadoop/yarn/client/cli/TestRMAdminCLI.java | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5b1a891/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java index eb9501b..c03be3d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java @@ -165,14 +165,14 @@ public class TestRMAdminCLI { dummyNodeLabelsManager.init(conf); } - @Test(timeout=500) + @Test public void testRefreshQueues() throws Exception { String[] args = { "-refreshQueues" }; assertEquals(0, rmAdminCLI.run(args)); verify(admin).refreshQueues(any(RefreshQueuesRequest.class)); } - @Test(timeout=500) + @Test public void testRefreshUserToGroupsMappings() throws Exception { String[] args = { "-refreshUserToGroupsMappings" }; assertEquals(0, rmAdminCLI.run(args)); @@ -180,7 +180,7 @@ public class TestRMAdminCLI { any(RefreshUserToGroupsMappingsRequest.class)); } - @Test(timeout=500) + @Test public void testRefreshSuperUserGroupsConfiguration() throws Exception { String[] args = { "-refreshSuperUserGroupsConfiguration" }; assertEquals(0, rmAdminCLI.run(args)); @@ -188,14 +188,14 @@ public class TestRMAdminCLI { any(RefreshSuperUserGroupsConfigurationRequest.class)); } - @Test(timeout=500) + @Test public void testRefreshAdminAcls() throws Exception { String[] args = { "-refreshAdminAcls" }; assertEquals(0, rmAdminCLI.run(args)); verify(admin).refreshAdminAcls(any(RefreshAdminAclsRequest.class)); } - @Test(timeout = 5000) + @Test public void testRefreshClusterMaxPriority() throws Exception { String[] args = { "-refreshClusterMaxPriority" }; assertEquals(0, rmAdminCLI.run(args)); @@ -203,14 +203,14 @@ public class TestRMAdminCLI { any(RefreshClusterMaxPriorityRequest.class)); } - @Test(timeout=500) + @Test public void testRefreshServiceAcl() throws Exception { String[] args = { "-refreshServiceAcl" }; assertEquals(0, rmAdminCLI.run(args)); verify(admin).refreshServiceAcls(any(RefreshServiceAclsRequest.class)); } - @Test(timeout=500) + @Test public void testUpdateNodeResource() throws Exception { String nodeIdStr = "0.0.0.0:0"; int memSize = 2048; @@ -234,7 +234,7 @@ public class TestRMAdminCLI { resource); } - @Test(timeout=500) + @Test public void testUpdateNodeResourceWithInvalidValue() throws Exception { String nodeIdStr = "0.0.0.0:0"; int memSize = -2048; @@ -248,7 +248,7 @@ public class TestRMAdminCLI { any(UpdateNodeResourceRequest.class)); } - @Test(timeout=500) + @Test public void testRefreshNodes() throws Exception { String[] args = { "-refreshNodes" }; assertEquals(0, rmAdminCLI.run(args)); @@ -355,7 +355,7 @@ public class TestRMAdminCLI { assertEquals(-1, rmAdminCLI.run(invalidTrackingArgs)); } - @Test(timeout=500) + @Test public void testGetGroups() throws Exception { when(admin.getGroupsForUser(eq("admin"))).thenReturn( new String[] {"group1", "group2"}); @@ -377,7 +377,7 @@ public class TestRMAdminCLI { } } - @Test(timeout = 500) + @Test public void testTransitionToActive() throws Exception { String[] args = {"-transitionToActive", "rm1"}; @@ -396,7 +396,7 @@ public class TestRMAdminCLI { verify(haadmin, times(1)).getServiceStatus(); } - @Test(timeout = 500) + @Test public void testTransitionToStandby() throws Exception { String[] args = {"-transitionToStandby", "rm1"}; @@ -413,7 +413,7 @@ public class TestRMAdminCLI { any(HAServiceProtocol.StateChangeRequestInfo.class)); } - @Test(timeout = 500) + @Test public void testGetServiceState() throws Exception { String[] args = {"-getServiceState", "rm1"}; @@ -428,7 +428,7 @@ public class TestRMAdminCLI { verify(haadmin).getServiceStatus(); } - @Test(timeout = 500) + @Test public void testCheckHealth() throws Exception { String[] args = {"-checkHealth", "rm1"}; @@ -446,7 +446,7 @@ public class TestRMAdminCLI { /** * Test printing of help messages */ - @Test(timeout=500) + @Test public void testHelp() throws Exception { PrintStream oldOutPrintStream = System.out; PrintStream oldErrPrintStream = System.err; @@ -583,7 +583,7 @@ public class TestRMAdminCLI { } } - @Test(timeout=500) + @Test public void testException() throws Exception { PrintStream oldErrPrintStream = System.err; ByteArrayOutputStream dataErr = new ByteArrayOutputStream(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
