HDFS-5103. Merging change r1514577 from branch-2 to branch-2.1-beta.

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

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

@@ -69,6 +69,8 @@ Release 2.1.1-beta - UNRELEASED
     HDFS-5100. TestNamenodeRetryCache fails on Windows due to incorrect cleanup.
     (Chuan Liu via cnauroth)
 
+    HDFS-5103. TestDirectoryScanner fails on Windows. (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/server/datanode/TestDirectoryScanner.java

@@ -394,12 +394,12 @@ public class TestDirectoryScanner {
     
     @Override
     public String getBasePath() {
-      return "/base";
+      return (new File("/base")).getAbsolutePath();
     }
     
     @Override
     public String getPath(String bpid) throws IOException {
-      return "/base/current/" + bpid;
+      return (new File("/base/current/" + bpid)).getAbsolutePath();
     }
 
     @Override
@@ -416,8 +416,6 @@ public class TestDirectoryScanner {
       
   void testScanInfoObject(long blockId, File blockFile, File metaFile)
       throws Exception {
-    assertEquals("/base/current/" + BPID_1 + "/finalized",
-        TEST_VOLUME.getFinalizedDir(BPID_1).getAbsolutePath());
     DirectoryScanner.ScanInfo scanInfo =
         new DirectoryScanner.ScanInfo(blockId, blockFile, metaFile, TEST_VOLUME);
     assertEquals(blockId, scanInfo.getBlockId());