svn commit: r1494377 - in /hadoop/common/branches/branch-1-win: CHANGES.branch-1-win.txt src/test/org/apache/hadoop/fs/FSMainOperationsBaseTest.java

[cn...@apache.org]

Author: cnauroth
Date: Tue Jun 18 23:36:33 2013
New Revision: 1494377

URL: http://svn.apache.org/r1494377
Log:
HADOOP-9624. TestFSMainOperationsLocalFileSystem failed when the Hadoop test root path has "X" in its name. Contributed by Xi Fang.

Modified:
    hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
    hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/fs/FSMainOperationsBaseTest.java

Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1494377&r1=1494376&r2=1494377&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Tue Jun 18 23:36:33 2013
@@ -413,3 +413,6 @@ Branch-hadoop-1-win (branched from branc
 
     HADOOP-8981. TestMetricsSystemImpl fails on Windows. (Xuan Gong, backported
     by Chris Nauroth via suresh)
+
+    HADOOP-9624. TestFSMainOperationsLocalFileSystem failed when the Hadoop test
+    root path has "X" in its name. (Xi Fang via cnauroth)

Modified: hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/fs/FSMainOperationsBaseTest.java?rev=1494377&r1=1494376&r2=1494377&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/fs/FSMainOperationsBaseTest.java (original)
+++ hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/fs/FSMainOperationsBaseTest.java Tue Jun 18 23:36:33 2013
@@ -66,10 +66,10 @@ public abstract class FSMainOperationsBa
     }
   };
 
-  //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() {
     public boolean accept(Path file) {
-      if(file.getName().contains("x") || file.toString().contains("X"))
+      if(file.getName().contains("x") || file.getName().contains("X"))
         return true;
       else
         return false;