Return-Path: 
 <core-commits-return-8332-apmail-hadoop-core-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org
Received: (qmail 83513 invoked from network); 26 Mar 2009 09:54:24 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 26 Mar 2009 09:54:24 -0000
Received: (qmail 12794 invoked by uid 500); 26 Mar 2009 09:54:24 -0000
Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org
Received: (qmail 12727 invoked by uid 500); 26 Mar 2009 09:54:24 -0000
Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:core-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:core-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:core-commits@hadoop.apache.org>
List-Id: <core-commits.hadoop.apache.org>
Reply-To: core-dev@hadoop.apache.org
Delivered-To: mailing list core-commits@hadoop.apache.org
Received: (qmail 12717 invoked by uid 99); 26 Mar 2009 09:54:23 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Mar 2009 09:54:23 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 26 Mar 2009 09:54:23 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B984B2388962; Thu, 26 Mar 2009 09:54:02 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r758572 - in /hadoop/core/trunk: CHANGES.txt
 src/test/org/apache/hadoop/cli/testConf.xml
Date: Thu, 26 Mar 2009 09:54:00 -0000
To: core-commits@hadoop.apache.org
From: cdouglas@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090326095402.B984B2388962@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cdouglas
Date: Thu Mar 26 09:53:50 2009
New Revision: 758572

URL: http://svn.apache.org/viewvc?rev=758572&view=rev
Log:
HADOOP-5477. Fix rare failure in TestCLI for hosts returning variations of
'localhost'. Contributed by Jacob Homan

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/test/org/apache/hadoop/cli/testConf.xml

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=758572&r1=758571&r2=758572&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Mar 26 09:53:50 2009
@@ -330,6 +330,9 @@
     HADOOP-5149. Modify HistoryViewer to ignore unfamiliar files in the log
     directory. (Hong Tang via cdouglas)
 
+    HADOOP-5477. Fix rare failure in TestCLI for hosts returning variations of
+    'localhost'. (Jacob Homan via cdouglas)
+
 Release 0.20.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/cli/testConf.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/cli/testConf.xml?rev=758572&r1=758571&r2=758572&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/cli/testConf.xml (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/cli/testConf.xml Thu Mar 26 09:53:50 2009
@@ -3347,19 +3347,19 @@
         <!-- miniDFS cluster started in TestCLI is set to match this output -->
         <comparator>
           <type>RegexpAcrossOutputComparator</type>
-          <expected-output>^Rack: \/rack1\s*127.0.0.1:\d+\s\(localhost\)\s*127.0.0.1:\d+\s\(localhost\)</expected-output>
+          <expected-output>^Rack: \/rack1\s*127\.0\.0\.1:\d+\s\(localhost.*\)\s*127\.0\.0\.1:\d+\s\(localhost.*\)</expected-output>
         </comparator>
         <comparator>
           <type>RegexpAcrossOutputComparator</type>
-          <expected-output>Rack: \/rack2\s*127.0.0.1:\d+\s\(localhost\)\s*127.0.0.1:\d+\s\(localhost\)\s*127.0.0.1:\d+\s\(localhost\)</expected-output>
+          <expected-output>Rack: \/rack2\s*127\.0\.0\.1:\d+\s\(localhost.*\)\s*127\.0\.0\.1:\d+\s\(localhost.*\)\s*127\.0\.0\.1:\d+\s\(localhost.*\)</expected-output>
         </comparator>
         <comparator>
           <type>RegexpAcrossOutputComparator</type>
-          <expected-output>Rack: \/rack3\s*127.0.0.1:\d+\s\(localhost\)</expected-output>
+          <expected-output>Rack: \/rack3\s*127\.0\.0\.1:\d+\s\(localhost.*\)</expected-output>
         </comparator>
         <comparator>
           <type>RegexpAcrossOutputComparator</type>
-          <expected-output>Rack: \/rack4\s*127.0.0.1:\d+\s\(localhost\)\s*127.0.0.1:\d+\s\(localhost\)</expected-output>
+          <expected-output>Rack: \/rack4\s*127\.0\.0\.1:\d+\s\(localhost.*\)\s*127\.0\.0\.1:\d+\s\(localhost.*\)</expected-output>
         </comparator>
       </comparators>
     </test>