YARN-7594. TestNMWebServices#testGetNMResourceInfo fails on trunk. Contributed by Gergely Novák.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bbda5d4d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bbda5d4d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bbda5d4d Branch: refs/heads/YARN-8200 Commit: bbda5d4d7253f41994c1aa66c0ef4dceb009b25b Parents: c4f1fa0 Author: Sunil G <sun...@apache.org> Authored: Mon Dec 4 10:45:07 2017 +0530 Committer: Konstantin V Shvachko <kshvac...@linkedin.com> Committed: Wed May 2 13:19:58 2018 -0700 ---------------------------------------------------------------------- .../server/nodemanager/webapp/TestNMWebServices.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bbda5d4d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java index c9c86b7..8cd8777 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java @@ -444,17 +444,17 @@ public class TestNMWebServices extends JerseyTestBase { ClientResponse.class); assertEquals(MediaType.APPLICATION_JSON, response.getType().toString()); - // Access resource-2 should fail (null NMResourceInfo returned). + // Access resource-2 should fail (empty NMResourceInfo returned). JSONObject json = response.getEntity(JSONObject.class); - assertIncludesException(json); + assertEquals(0, json.length()); - // Access resource-3 should fail (unkown plugin) + // Access resource-3 should fail (unknown plugin) response = r.path("ws").path("v1").path("node").path( "resources").path("resource-3").accept(MediaType.APPLICATION_JSON).get( ClientResponse.class); assertEquals(MediaType.APPLICATION_JSON, response.getType().toString()); json = response.getEntity(JSONObject.class); - assertIncludesException(json); + assertEquals(0, json.length()); // Access resource-1 should success response = r.path("ws").path("v1").path("node").path( @@ -522,10 +522,6 @@ public class TestNMWebServices extends JerseyTestBase { assertEquals(2, json.getJSONArray("assignedGpuDevices").length()); } - private void assertIncludesException(JSONObject json) { - assertTrue(json.has("RemoteException")); - } - private void testContainerLogs(WebResource r, ContainerId containerId) throws IOException { final String containerIdStr = containerId.toString(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
