diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java index 1269f89..387a031 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java @@ -39,7 +39,6 @@ import org.apache.hadoop.yarn.client.api.YarnClient; import org.apache.hadoop.yarn.conf.HAUtil; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException; import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.server.MiniYARNCluster; import org.apache.hadoop.yarn.server.resourcemanager.AdminService; @@ -208,17 +207,19 @@ public void testWebAppProxyInStandAloneMode() throws YarnException, webAppProxyServer.start(); Assert.assertEquals(STATE.STARTED, webAppProxyServer.getServiceState()); + // send httpRequest with fakeApplicationId + // expect to get "Not Found" response URL wrongUrl = new URL("http://0.0.0.0:9099/proxy/" + fakeAppId); HttpURLConnection proxyConn = (HttpURLConnection) wrongUrl .openConnection(); proxyConn.connect(); - verifyExpectedException(proxyConn.getResponseMessage()); + verifyResponseMessage(proxyConn.getResponseMessage()); explicitFailover(); verifyConnections(); proxyConn.connect(); - verifyExpectedException(proxyConn.getResponseMessage()); + verifyResponseMessage(proxyConn.getResponseMessage()); } finally { webAppProxyServer.stop(); } @@ -233,25 +234,24 @@ public void testEmbeddedWebAppProxy() throws YarnException, getAdminService(0).transitionToActive(req); assertFalse("RM never turned active", -1 == cluster.getActiveRMIndex()); verifyConnections(); + + // send httpRequest with fakeApplicationId + // expect to get "Not Found" response URL wrongUrl = new URL("http://0.0.0.0:18088/proxy/" + fakeAppId); HttpURLConnection proxyConn = (HttpURLConnection) wrongUrl .openConnection(); proxyConn.connect(); - verifyExpectedException(proxyConn.getResponseMessage()); + verifyResponseMessage(proxyConn.getResponseMessage()); explicitFailover(); verifyConnections(); proxyConn.connect(); - verifyExpectedException(proxyConn.getResponseMessage()); + verifyResponseMessage(proxyConn.getResponseMessage()); } - private void verifyExpectedException(String exceptionMessage){ - assertTrue(exceptionMessage.contains(ApplicationNotFoundException.class - .getName())); - assertTrue(exceptionMessage - .contains("Application with id '" + fakeAppId + "' " + - "doesn't exist in RM.")); + private void verifyResponseMessage(String responseMessage){ + assertEquals("Not Found", responseMessage); } @Test