diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java index 4a401e7..861c867 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java @@ -183,9 +183,6 @@ private void setupInternal(int numNodeManager, float timelineVersion) 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 +277,7 @@ public void testDSShellWithDomainV1_5() throws Exception { testDSShell(true); } - @Test(timeout=90000) + @Test @TimelineVersion(2.0f) public void testDSShellWithoutDomainV2() throws Exception { testDSShell(false); @@ -290,12 +287,14 @@ public void testDSShell(boolean haveDomain) throws Exception { 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); }