Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-8310. Fix TestCLI.testAll 'help: help for find' on Windows. (Kiran Kumar M R via Xiaoyu Yao) 

(cherry picked from commit 7a26d174af)
This commit is contained in:
Xiaoyu Yao 2015-05-06 10:24:46 -07:00
parent a0445eae5c
commit bd88215393
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/RegexpAcrossOutputComparator.java
View File

@ -18,6 +18,7 @@
package org.apache.hadoop.cli.util; package org.apache.hadoop.cli.util;
import org.apache.hadoop.util.Shell;
import java.util.regex.Pattern; import java.util.regex.Pattern;
/** /**
@ -33,6 +34,10 @@ public class RegexpAcrossOutputComparator extends ComparatorBase {
@Override @Override
public boolean compare(String actual, String expected) { public boolean compare(String actual, String expected) {
if (Shell.WINDOWS) {
actual = actual.replaceAll("\\r", "");
expected = expected.replaceAll("\\r", "");
}
return Pattern.compile(expected).matcher(actual).find(); return Pattern.compile(expected).matcher(actual).find();
} }

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -305,6 +305,9 @@ Release 2.8.0 - UNRELEASED
HDFS-8219. setStoragePolicy with folder behavior is different after cluster restart. HDFS-8219. setStoragePolicy with folder behavior is different after cluster restart.
(surendra singh lilhore via Xiaoyu Yao) (surendra singh lilhore via Xiaoyu Yao)
HDFS-8310. Fix TestCLI.testAll "help: help for find" on Windows.
(Kiran Kumar M R via Xiaoyu Yao)
Release 2.7.1 - UNRELEASED Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES