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>
