Author: junping_du
Date: Thu Apr 17 19:15:44 2014
New Revision: 1588348
URL: http://svn.apache.org/r1588348
Log:
Merge r1588347 from branch2: YARN-1750.
TestNodeStatusUpdater#testNMRegistration is incorrect in test case. (Wangda Tan
via junping_du)
Modified:
hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java
Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt?rev=1588348&r1=1588347&r2=1588348&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt Thu Apr
17 19:15:44 2014
@@ -64,6 +64,9 @@ Release 2.4.1 - UNRELEASED
YARN-1931. Private API change in YARN-1824 in 2.4 broke compatibility
with previous releases (Sandy Ryza via tgraves)
+ YARN-1750. TestNodeStatusUpdater#testNMRegistration is incorrect in test
+ case. (Wangda Tan via junping_du)
+
Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java?rev=1588348&r1=1588347&r2=1588348&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java
Thu Apr 17 19:15:44 2014
@@ -261,10 +261,12 @@ public class TestNodeStatusUpdater {
this.context.getContainers().put(secondContainerID, container);
} else if (heartBeatID == 3) {
// Checks on the RM end
- Assert.assertEquals("Number of applications should only be one!", 1,
+ Assert.assertEquals("Number of applications should have two!", 2,
appToContainers.size());
- Assert.assertEquals("Number of container for the app should be two!",
- 2, appToContainers.get(appId2).size());
+ Assert.assertEquals("Number of container for the app-1 should be only
one!",
+ 1, appToContainers.get(appId1).size());
+ Assert.assertEquals("Number of container for the app-2 should be only
one!",
+ 1, appToContainers.get(appId2).size());
// Checks on the NM end
ConcurrentMap<ContainerId, Container> activeContainers =
