HDFS-4632. Merging change r1514168 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514169 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2013-08-15 06:14:41 +00:00
parent 49dcb7cfaa
commit aaada1c859
2 changed files with 6 additions and 0 deletions

View File

@ -101,6 +101,9 @@ Release 2.1.1-beta - UNRELEASED
HDFS-4898. BlockPlacementPolicyWithNodeGroup.chooseRemoteRack() fails to HDFS-4898. BlockPlacementPolicyWithNodeGroup.chooseRemoteRack() fails to
properly fallback to local rack. (szetszwo) properly fallback to local rack. (szetszwo)
HDFS-4632. globStatus using backslash for escaping does not work on Windows.
(Chuan Liu via cnauroth)
Release 2.1.0-beta - 2013-08-06 Release 2.1.0-beta - 2013-08-06
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -466,6 +466,9 @@ public class TestGlobPaths {
@Test @Test
public void pTestEscape() throws IOException { public void pTestEscape() throws IOException {
// Skip the test case on Windows because backslash will be treated as a
// path separator instead of an escaping character on Windows.
org.junit.Assume.assumeTrue(!Path.WINDOWS);
try { try {
String [] files = new String[] {USER_DIR+"/ab\\[c.d"}; String [] files = new String[] {USER_DIR+"/ab\\[c.d"};
Path[] matchedPath = prepareTesting(USER_DIR+"/ab\\[c.d", files); Path[] matchedPath = prepareTesting(USER_DIR+"/ab\\[c.d", files);