HDFS-5103. TestDirectoryScanner fails on Windows. Contributed by Chuan Liu.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1514576 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2013-08-16 04:38:03 +00:00
parent 99064ec905
commit d9de6a928d
2 changed files with 4 additions and 4 deletions

View File

@ -348,6 +348,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

View File

@ -394,12 +394,12 @@ public long getAvailable() throws IOException {
@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 File getFinalizedDir(String bpid) throws IOException {
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());