From c5394276963e540ccba2b4ab912f6f7807e9da66 Mon Sep 17 00:00:00 2001 From: Sunil G Date: Mon, 4 Dec 2017 10:45:07 +0530 Subject: [PATCH] =?UTF-8?q?YARN-7594.=20TestNMWebServices#testGetNMResourc?= =?UTF-8?q?eInfo=20fails=20on=20trunk.=20Contributed=20by=20Gergely=20Nov?= =?UTF-8?q?=C3=A1k.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/nodemanager/webapp/TestNMWebServices.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) 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 72071dae1f9..2f1577f10b7 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 @@ -456,17 +456,17 @@ public void testGetNMResourceInfo() 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( @@ -533,10 +533,6 @@ public void testGetYarnGpuResourceInfo() 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();