MAPREDUCE-2271. Fix TestSetupTaskScheduling failure on trunk. Contributed by Liyin Liang.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1063811 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 85ac98d..0f5930d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -45,6 +45,9 @@
     MAPREDUCE-2232. Add missing methods to TestMapredGroupMappingServiceRefresh.
     (Todd Lipcon via eli)
 
+    MAPREDUCE-2271. Fix TestSetupTaskScheduling failure on trunk.
+    (Liyin Liang via todd)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/src/test/mapred/org/apache/hadoop/mapred/TestSetupTaskScheduling.java b/src/test/mapred/org/apache/hadoop/mapred/TestSetupTaskScheduling.java
index 01cfdc1..059d692 100644
--- a/src/test/mapred/org/apache/hadoop/mapred/TestSetupTaskScheduling.java
+++ b/src/test/mapred/org/apache/hadoop/mapred/TestSetupTaskScheduling.java
@@ -322,11 +322,6 @@
     List<TaskStatus> taskStatuses = new ArrayList<TaskStatus>();
     TaskTrackerStatus ttStatus =
       createTaskTrackerStatus(trackers[0], taskStatuses);//create dummy status
-    addNewTaskStatus(job, TaskType.TASK_CLEANUP, true, trackers[0],
-                     taskStatuses);// status of map task's cleanup task
-    addNewTaskStatus(job, TaskType.TASK_CLEANUP, false, trackers[0],
-                     taskStatuses);// status of reduce task's cleanup task
-    ttStatus = createTaskTrackerStatus(trackers[0], taskStatuses);
     
     // validate mapTaskCleanup task
     validateNumSlotsUsedForTaskCleanup(ttStatus);