From common-commits-return-78495-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Tue Feb 6 12:35:17 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id F376F180657 for ; Tue, 6 Feb 2018 12:35:16 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E3071160C45; Tue, 6 Feb 2018 11:35:16 +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 37CC2160C3A for ; Tue, 6 Feb 2018 12:35:16 +0100 (CET) Received: (qmail 10280 invoked by uid 500); 6 Feb 2018 11:35:10 -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 10270 invoked by uid 99); 6 Feb 2018 11:35:10 -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; Tue, 06 Feb 2018 11:35:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3689CDFF6D; Tue, 6 Feb 2018 11:35:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wwei@apache.org To: common-commits@hadoop.apache.org Message-Id: <9d616a6857f64212ab8bc1496da59524@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-7860. Fix UT failure TestRMWebServiceAppsNodelabel#testAppsRunning. Contributed by Sunil G. Date: Tue, 6 Feb 2018 11:35:08 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk 72415c39c -> bff858e91 YARN-7860. Fix UT failure TestRMWebServiceAppsNodelabel#testAppsRunning. Contributed by Sunil G. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bff858e9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bff858e9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bff858e9 Branch: refs/heads/trunk Commit: bff858e910f69991e6c75151d9b89c3e78210f16 Parents: 72415c3 Author: Weiwei Yang Authored: Tue Feb 6 19:33:04 2018 +0800 Committer: Weiwei Yang Committed: Tue Feb 6 19:33:04 2018 +0800 ---------------------------------------------------------------------- .../webapp/TestRMWebServiceAppsNodelabel.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bff858e9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.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/webapp/TestRMWebServiceAppsNodelabel.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java index c8afd4b..3815fb9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java @@ -213,13 +213,18 @@ public class TestRMWebServiceAppsNodelabel extends JerseyTestBase { private void verifyResource(JSONObject partition, String partitionName, String amused, String used, String reserved) throws JSONException { + JSONObject amusedObject = (JSONObject) partition.get("amUsed"); + JSONObject usedObject = (JSONObject) partition.get("used"); + JSONObject reservedObject = (JSONObject) partition.get("reserved"); assertEquals("Partition expected", partitionName, partition.get("partitionName")); - assertEquals("partition amused", amused, - partition.get("amUsed").toString()); - assertEquals("partition used", used, partition.get("used").toString()); + assertEquals("partition amused", amused, getResource( + (int) amusedObject.get("memory"), (int) amusedObject.get("vCores"))); + assertEquals("partition used", used, getResource( + (int) usedObject.get("memory"), (int) usedObject.get("vCores"))); assertEquals("partition reserved", reserved, - partition.get("reserved").toString()); + getResource((int) reservedObject.get("memory"), + (int) reservedObject.get("vCores"))); } @SuppressWarnings("unchecked") --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org