Return-Path: X-Original-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4BFF3108D9 for ; Thu, 17 Apr 2014 19:07:11 +0000 (UTC) Received: (qmail 81878 invoked by uid 500); 17 Apr 2014 19:07:10 -0000 Delivered-To: apmail-hadoop-yarn-commits-archive@hadoop.apache.org Received: (qmail 81807 invoked by uid 500); 17 Apr 2014 19:07:10 -0000 Mailing-List: contact yarn-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: yarn-commits@hadoop.apache.org Delivered-To: mailing list yarn-commits@hadoop.apache.org Received: (qmail 81797 invoked by uid 99); 17 Apr 2014 19:07:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Apr 2014 19:07:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Apr 2014 19:07:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 93F92238890D; Thu, 17 Apr 2014 19:06:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1588343 - in /hadoop/common/trunk/hadoop-yarn-project: CHANGES.txt hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java Date: Thu, 17 Apr 2014 19:06:48 -0000 To: yarn-commits@hadoop.apache.org From: junping_du@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140417190648.93F92238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: junping_du Date: Thu Apr 17 19:06:48 2014 New Revision: 1588343 URL: http://svn.apache.org/r1588343 Log: YARN-1750. TestNodeStatusUpdater#testNMRegistration is incorrect in test case. (Wangda Tan via junping_du) Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt hadoop/common/trunk/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/trunk/hadoop-yarn-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1588343&r1=1588342&r2=1588343&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Thu Apr 17 19:06:48 2014 @@ -135,6 +135,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/trunk/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/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java?rev=1588343&r1=1588342&r2=1588343&view=diff ============================================================================== --- hadoop/common/trunk/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/trunk/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:06:48 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 activeContainers =