You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ww...@apache.org on 2018/02/06 11:35:08 UTC
hadoop git commit: YARN-7860. Fix UT failure
TestRMWebServiceAppsNodelabel#testAppsRunning. Contributed by Sunil G.
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 <ww...@apache.org>
Authored: Tue Feb 6 19:33:04 2018 +0800
Committer: Weiwei Yang <ww...@apache.org>
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