HDFS-5106. Merging change r1514911 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514914 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -129,6 +129,9 @@ Release 2.1.1-beta - UNRELEASED
 
     HDFS-5105. TestFsck fails on Windows. (Chuan Liu via arp)
 
+    HDFS-5106. TestDatanodeBlockScanner fails on Windows due to incorrect path
+    format. (Chuan Liu via cnauroth)
+
 Release 2.1.0-beta - 2013-08-22
 
   INCOMPATIBLE CHANGES

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java

@@ -440,7 +440,8 @@ public class TestDatanodeBlockScanner {
     }
   }
   
-  private static final String BASE_PATH = "/data/current/finalized";
+  private static final String BASE_PATH = (new File("/data/current/finalized"))
+      .getAbsolutePath();
   
   @Test
   public void testReplicaInfoParsing() throws Exception {