Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2B4B6200D0F for ; Fri, 29 Sep 2017 17:54:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 29FBD1609D1; Fri, 29 Sep 2017 15:54:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6D60B1609C5 for ; Fri, 29 Sep 2017 17:54:56 +0200 (CEST) Received: (qmail 80230 invoked by uid 500); 29 Sep 2017 15:54:55 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 80221 invoked by uid 99); 29 Sep 2017 15:54:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Sep 2017 15:54:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 89572F580B; Fri, 29 Sep 2017 15:54:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: epayne@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-7084. TestSchedulingMonitor#testRMStarts fails sporadically. Contributed by Jason Lowe. Date: Fri, 29 Sep 2017 15:54:53 +0000 (UTC) archived-at: Fri, 29 Sep 2017 15:54:57 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2 c0bfb385a -> b0ba31c51 YARN-7084. TestSchedulingMonitor#testRMStarts fails sporadically. Contributed by Jason Lowe. (cherry picked from commit 7f6118f918e0fbe81cb64e8b9f6959b8d66679f6) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b0ba31c5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b0ba31c5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b0ba31c5 Branch: refs/heads/branch-2 Commit: b0ba31c518087f7a930539db63106ddde93f5fdd Parents: c0bfb38 Author: Eric Payne Authored: Fri Sep 29 10:33:57 2017 -0500 Committer: Eric Payne Committed: Fri Sep 29 10:50:21 2017 -0500 ---------------------------------------------------------------------- .../monitor/TestSchedulingMonitor.java | 34 +++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b0ba31c5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/TestSchedulingMonitor.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/TestSchedulingMonitor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/TestSchedulingMonitor.java index d6ac346..c38236d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/TestSchedulingMonitor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/TestSchedulingMonitor.java @@ -25,42 +25,30 @@ import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy; import org.junit.Test; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.timeout; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class TestSchedulingMonitor { @Test(timeout = 10000) - public void testRMStarts() { + public void testRMStarts() throws Exception { Configuration conf = new YarnConfiguration(); conf.setBoolean(YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS, true); conf.set(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES, ProportionalCapacityPreemptionPolicy.class.getCanonicalName()); ResourceManager rm = new MockRM(); - try { - rm.init(conf); - } catch (Exception e) { - fail("ResourceManager does not start when " + - YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS + " is set to true"); - } - + rm.init(conf); SchedulingEditPolicy mPolicy = mock(SchedulingEditPolicy.class); when(mPolicy.getMonitoringInterval()).thenReturn(1000L); SchedulingMonitor monitor = new SchedulingMonitor(rm.getRMContext(), mPolicy); - try { - monitor.serviceInit(conf); - monitor.serviceStart(); - } catch (Exception e) { - fail("SchedulingMonitor failes to start."); - } - verify(mPolicy, times(1)).editSchedule(); - try { - monitor.close(); - rm.close(); - } catch (Exception e) { - fail("Failed to close."); - } + monitor.serviceInit(conf); + monitor.serviceStart(); + verify(mPolicy, timeout(10000)).editSchedule(); + monitor.close(); + rm.close(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org