YARN-5050. Code cleanup for TestDistributedShell (Li Lu via sjlee)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c8100fdb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c8100fdb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c8100fdb Branch: refs/heads/YARN-2928 Commit: c8100fdb474bce91c1154a07d85ba99c0c6099d5 Parents: 6fc95ff Author: Sangjin Lee <sj...@apache.org> Authored: Thu May 19 17:25:05 2016 -0700 Committer: Sangjin Lee <sj...@apache.org> Committed: Fri Jul 8 10:19:04 2016 -0700 ---------------------------------------------------------------------- .../distributedshell/TestDistributedShell.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c8100fdb/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java index ba11e60..c02cd85 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java @@ -135,6 +135,8 @@ public class TestDistributedShell { conf = new YarnConfiguration(); conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 128); + // reduce the teardown waiting time + conf.setLong(YarnConfiguration.DISPATCHER_DRAIN_EVENTS_TIMEOUT, 1000); conf.set("yarn.log.dir", "target"); conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true); // mark if we need to launch the v1 timeline server @@ -183,9 +185,6 @@ public class TestDistributedShell { conf.set(YarnConfiguration.NM_AUX_SERVICES, TIMELINE_AUX_SERVICE_NAME); conf.set(YarnConfiguration.NM_AUX_SERVICES + "." + TIMELINE_AUX_SERVICE_NAME + ".class", PerNodeTimelineCollectorsAuxService.class.getName()); - conf.setBoolean(YarnConfiguration.SYSTEM_METRICS_PUBLISHER_ENABLED, true); - conf.setBoolean(YarnConfiguration.RM_SYSTEM_METRICS_PUBLISHER_ENABLED, - false); } else { Assert.fail("Wrong timeline version number: " + timelineVersion); } @@ -280,7 +279,7 @@ public class TestDistributedShell { testDSShell(true); } - @Test(timeout=90000) + @Test @TimelineVersion(2.0f) public void testDSShellWithoutDomainV2() throws Exception { testDSShell(false); @@ -290,12 +289,14 @@ public class TestDistributedShell { testDSShell(haveDomain, true); } - @Test(timeout=90000) + @Test + @TimelineVersion(2.0f) public void testDSShellWithoutDomainV2DefaultFlow() throws Exception { testDSShell(false, true); } - @Test(timeout=90000) + @Test + @TimelineVersion(2.0f) public void testDSShellWithoutDomainV2CustomizedFlow() throws Exception { testDSShell(false, false); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
