From 8e81e6fcaf9f8d9b308524c45b6c56e45b21bc50 Mon Sep 17 00:00:00 2001 From: Chris Nauroth Date: Tue, 18 Jun 2013 23:07:25 +0000 Subject: [PATCH] HADOOP-9624. Merging change r1494363 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494365 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java | 2 +- .../apache/hadoop/fs/FileContextMainOperationsBaseTest.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 955c23ae361..95b5ef06be8 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -275,6 +275,9 @@ Release 2.1.0-beta - UNRELEASED HADOOP-9632. TestShellCommandFencer will fail if there is a 'host' machine in the network. (Chuan Liu via cnauroth) + HADOOP-9624. TestFSMainOperationsLocalFileSystem failed when the Hadoop test + root path has "X" in its name. (Xi Fang via cnauroth) + BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS HADOOP-8924. Hadoop Common creating package-info.java must not depend on diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java index 8506ea9bee8..807f0cccb58 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java @@ -71,7 +71,7 @@ public abstract class FSMainOperationsBaseTest extends FileSystemTestHelper { } }; - //A test filter with returns any path containing a "b" + //A test filter with returns any path containing an "x" or "X" final private static PathFilter TEST_X_FILTER = new PathFilter() { @Override public boolean accept(Path file) { diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java index 2cf611fc70b..354f7aabfd6 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java @@ -81,7 +81,7 @@ public abstract class FileContextMainOperationsBaseTest { } }; - //A test filter with returns any path containing a "b" + //A test filter with returns any path containing an "x" or "X" final private static PathFilter TEST_X_FILTER = new PathFilter() { @Override public boolean accept(Path file) {