MAPREDUCE-6142. Fixed test failures in TestJobHistoryEventHandler and TestMRTimelineEventHandling. Contributed by Zhijie Shen.

(cherry picked from commit 3f1441245db047b5b7289fe06c4c3306fe8189af)

hadoop-mapreduce-project/CHANGES.txt

@@ -228,6 +228,9 @@ Release 2.6.0 - UNRELEASED
     MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent.
     (Junping Du via jianhe)
 
+    MAPREDUCE-6142. Fixed test failures in TestJobHistoryEventHandler and
+    TestMRTimelineEventHandling. (Zhijie Shen via vinodkv)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java

@@ -446,6 +446,7 @@ public class TestJobHistoryEventHandler {
     TestParams t = new TestParams(false);
     Configuration conf = new YarnConfiguration();
     conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
+    conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, true);
     JHEvenHandlerForTest jheh = new JHEvenHandlerForTest(t.mockAppContext, 0);
     jheh.init(conf);
     MiniYARNCluster yarnCluster = null;

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRTimelineEventHandling.java

@@ -38,6 +38,7 @@ public class TestMRTimelineEventHandling {
   public void testMRTimelineEventHandling() throws Exception {
     Configuration conf = new YarnConfiguration();
     conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
+    conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, true);
     MiniMRYarnCluster cluster = null;
     try {
       cluster = new MiniMRYarnCluster(