Return-Path: X-Original-To: apmail-chukwa-commits-archive@www.apache.org Delivered-To: apmail-chukwa-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CD02CCAF7 for ; Sat, 9 Aug 2014 17:36:51 +0000 (UTC) Received: (qmail 4611 invoked by uid 500); 9 Aug 2014 17:36:51 -0000 Delivered-To: apmail-chukwa-commits-archive@chukwa.apache.org Received: (qmail 4578 invoked by uid 500); 9 Aug 2014 17:36:51 -0000 Mailing-List: contact commits-help@chukwa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@chukwa.apache.org Delivered-To: mailing list commits@chukwa.apache.org Received: (qmail 4567 invoked by uid 99); 9 Aug 2014 17:36:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Aug 2014 17:36:51 +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; Sat, 09 Aug 2014 17:36:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5520223889E2; Sat, 9 Aug 2014 17:36:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1616998 - in /chukwa/trunk: CHANGES.txt src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestSocketAdaptor.java Date: Sat, 09 Aug 2014 17:36:28 -0000 To: commits@chukwa.apache.org From: eyang@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140809173628.5520223889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: eyang Date: Sat Aug 9 17:36:27 2014 New Revision: 1616998 URL: http://svn.apache.org/r1616998 Log: CHUKWA-726. Reduce SocketAdaptor test case timer delay from 120 to 10 seconds. (Eric Yang) Modified: chukwa/trunk/CHANGES.txt chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestSocketAdaptor.java Modified: chukwa/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/chukwa/trunk/CHANGES.txt?rev=1616998&r1=1616997&r2=1616998&view=diff ============================================================================== --- chukwa/trunk/CHANGES.txt (original) +++ chukwa/trunk/CHANGES.txt Sat Aug 9 17:36:27 2014 @@ -74,6 +74,8 @@ Release 0.6 - Unreleased BUGS + CHUKWA-726. Reduce SocketAdaptor test case timer delay from 120 to 10 seconds. (Eric Yang) + CHUKWA-725. Remove Solr config file from license scanning. (Eric Yang) CHUKWA-716. Fixed undefined System Properties for test cases and test case dependency. (Eric Yang) Modified: chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestSocketAdaptor.java URL: http://svn.apache.org/viewvc/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestSocketAdaptor.java?rev=1616998&r1=1616997&r2=1616998&view=diff ============================================================================== --- chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestSocketAdaptor.java (original) +++ chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestSocketAdaptor.java Sat Aug 9 17:36:27 2014 @@ -26,7 +26,7 @@ import junit.framework.TestCase; public class TestSocketAdaptor extends TestCase { public void testBindRetry() { int port = 9181; - int delay = 120000; + int delay = 10000; ServerSocket sock1 = null; ServerSocket sock2 = null; SocketAdaptor adaptor = new SocketAdaptor(); @@ -42,7 +42,7 @@ public class TestSocketAdaptor extends T fail("IOException binding to " + port); } // now try binding to the same port through SocketAdaptor - // making sure we retry until the specified time of 120s + // making sure we retry until the specified time of 10s long startTime = System.currentTimeMillis(); try { sock2 = new ServerSocket();