YARN-1555. Fixed test failures in applicationhistoryservice.* (Vinod Kumar Vavilapalli via mayank)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/YARN-321@1555274 13f79535-47bb-0310-9956-ffa450edef68

hadoop-yarn-project/CHANGES.txt

@@ -463,6 +463,9 @@ Branch YARN-321: Generic ApplicationHistoryService
   YARN-1413. Implemented serving of aggregated-logs in the ApplicationHistory
   server. (Mayank Bansal via vinodkv)
 
+  YARN-1555. Fixed test failures in applicationhistoryservice.* (Vinod Kumar 
+  Vavilapalli via mayank)
+
 Release 2.1.1-beta - UNRELEASED
 
     YARN-948. Changed ResourceManager to validate the release container list

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryStoreTestUtils.java

@@ -86,7 +86,7 @@ public class ApplicationHistoryStoreTestUtils {
       throws IOException {
     store.containerFinished(
         ContainerFinishData.newInstance(containerId, 0, containerId.toString(),
-            "http://localhost:0/", 0, ContainerState.COMPLETE));
+            "http://localhost:0/log", 0, ContainerState.COMPLETE));
   }
 
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java

@@ -40,7 +40,7 @@ public class TestApplicationHistoryServer {
     Configuration config = new YarnConfiguration();
     historyServer.init(config);
     assertEquals(STATE.INITED, historyServer.getServiceState());
-    assertEquals(3, historyServer.getServices().size());
+    assertEquals(2, historyServer.getServices().size());
     ApplicationHistoryClientService historyService = historyServer
         .getClientService();
     assertNotNull(historyServer.getClientService());

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java

@@ -287,7 +287,7 @@ public class TestAHSWebServices extends JerseyTest {
         container.getString("assignedNodeId"));
     assertEquals(Priority.newInstance(containerId.getId()).toString(),
         container.getString("priority"));
-    assertEquals("http://localhost:0/", container.getString("logUrl"));
+    assertEquals("http://localhost:0/log", container.getString("logUrl"));
     assertEquals(ContainerState.COMPLETE.toString(),
         container.getString("containerState"));
   }