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 18D65114F0 for ; Thu, 7 Aug 2014 05:37:12 +0000 (UTC) Received: (qmail 48855 invoked by uid 500); 7 Aug 2014 05:37:12 -0000 Delivered-To: apmail-hadoop-yarn-commits-archive@hadoop.apache.org Received: (qmail 48771 invoked by uid 500); 7 Aug 2014 05:37:11 -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 48717 invoked by uid 99); 7 Aug 2014 05:37:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Aug 2014 05:37:11 +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, 07 Aug 2014 05:37:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 96CC1238923D; Thu, 7 Aug 2014 05:36:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1616405 - in /hadoop/common/trunk/hadoop-yarn-project: CHANGES.txt hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java Date: Thu, 07 Aug 2014 05:36:50 -0000 To: yarn-commits@hadoop.apache.org From: zjshen@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140807053650.96CC1238923D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: zjshen Date: Thu Aug 7 05:36:50 2014 New Revision: 1616405 URL: http://svn.apache.org/r1616405 Log: YARN-2388. Fixed TestTimelineWebServices failure due to HADOOP-10791. Contributed by Zhijie Shen. Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.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=1616405&r1=1616404&r2=1616405&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Thu Aug 7 05:36:50 2014 @@ -140,6 +140,8 @@ Release 2.6.0 - UNRELEASED YARN-2359. Application hangs when it fails to launch AM container. (Zhihai Xu via kasha) + YARN-2388. Fixed TestTimelineWebServices failure due to HADOOP-10791. (zjshen) + Release 2.5.0 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java?rev=1616405&r1=1616404&r2=1616405&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java Thu Aug 7 05:36:50 2014 @@ -33,6 +33,7 @@ import java.util.Map; import java.util.Set; import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.ws.rs.core.MediaType; @@ -105,6 +106,8 @@ public class TestTimelineWebServices ext .thenReturn("simple"); when(filterConfig.getInitParameter( PseudoAuthenticationHandler.ANONYMOUS_ALLOWED)).thenReturn("true"); + ServletContext context = mock(ServletContext.class); + when(filterConfig.getServletContext()).thenReturn(context); Enumeration names = mock(Enumeration.class); when(names.hasMoreElements()).thenReturn(true, true, false); when(names.nextElement()).thenReturn(