From common-commits-return-84261-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Thu Jun 14 18:50:02 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id B3311180600 for ; Thu, 14 Jun 2018 18:50:01 +0200 (CEST) Received: (qmail 82701 invoked by uid 500); 14 Jun 2018 16:49:59 -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 81594 invoked by uid 99); 14 Jun 2018 16:49:59 -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; Thu, 14 Jun 2018 16:49:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 320A8E119E; Thu, 14 Jun 2018 16:49:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arp@apache.org To: common-commits@hadoop.apache.org Date: Thu, 14 Jun 2018 16:50:05 -0000 Message-Id: <47d3f0bbb59e497094a951a1f2932160@git.apache.org> In-Reply-To: <55dfe12c360540528ca28555598121ad@git.apache.org> References: <55dfe12c360540528ca28555598121ad@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/50] [abbrv] hadoop git commit: YARN-8422. TestAMSimulator failing with NPE. Contributed by Giovanni Matteo Fumarola. YARN-8422. TestAMSimulator failing with NPE. Contributed by Giovanni Matteo Fumarola. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c3548159 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c3548159 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c3548159 Branch: refs/heads/HDDS-48 Commit: c35481594ffc372e3f846b0c8ebc2ff9e36ffdb0 Parents: 6e756e8 Author: Inigo Goiri Authored: Tue Jun 12 10:59:50 2018 -0700 Committer: Inigo Goiri Committed: Tue Jun 12 10:59:50 2018 -0700 ---------------------------------------------------------------------- .../hadoop/yarn/sls/appmaster/TestAMSimulator.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3548159/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java index bfc7d0c..bc8ea70 100644 --- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java +++ b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java @@ -49,8 +49,8 @@ public class TestAMSimulator { private YarnConfiguration conf; private Path metricOutputDir; - private Class slsScheduler; - private Class scheduler; + private Class slsScheduler; + private Class scheduler; @Parameterized.Parameters public static Collection params() { @@ -60,7 +60,7 @@ public class TestAMSimulator { }); } - public TestAMSimulator(Class slsScheduler, Class scheduler) { + public TestAMSimulator(Class slsScheduler, Class scheduler) { this.slsScheduler = slsScheduler; this.scheduler = scheduler; } @@ -115,7 +115,8 @@ public class TestAMSimulator { } private void createMetricOutputDir() { - Path testDir = Paths.get(System.getProperty("test.build.data")); + Path testDir = + Paths.get(System.getProperty("test.build.data", "target/test-dir")); try { metricOutputDir = Files.createTempDirectory(testDir, "output"); } catch (IOException e) { @@ -153,7 +154,9 @@ public class TestAMSimulator { @After public void tearDown() { - rm.stop(); + if (rm != null) { + rm.stop(); + } deleteMetricOutputDir(); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org