YARN-1262. TestApplicationCleanup relies on all containers assigned in a single heartbeat (Karthik Kambatla via Sandy Ryza)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1528653 13f79535-47bb-0310-9956-ffa450edef68

hadoop-yarn-project/CHANGES.txt

@@ -60,6 +60,9 @@ Release 2.1.2 - UNRELEASED
 
     YARN-1215. Yarn URL should include userinfo. (Chuan Liu via cnauroth)
 
+    YARN-1262. TestApplicationCleanup relies on all containers assigned in a
+    single heartbeat (Karthik Kambatla via Sandy Ryza)
+
     YARN-1260. Added webapp.http.address to yarn-default.xml so that default
     install with https enabled doesn't have broken link on NM UI. (Omkar Vinit
     Joshi via vinodkv)

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java

@@ -88,6 +88,7 @@ public class TestApplicationCleanup {
       conts = am.allocate(new ArrayList<ResourceRequest>(),
           new ArrayList<ContainerId>()).getAllocatedContainers();
       contReceived += conts.size();
+      nm1.nodeHeartbeat(true);
     }
     Assert.assertEquals(request, contReceived);
     
@@ -178,6 +179,7 @@ public class TestApplicationCleanup {
           new ArrayList<ContainerId>()).getAllocatedContainers();
       dispatcher.await();
       contReceived += conts.size();
+      nm1.nodeHeartbeat(true);
     }
     Assert.assertEquals(request, contReceived);