Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10495. Merging change r1587137 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587138 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2014-04-14 04:14:57 +00:00
parent 1134ccdb0d
commit 065a09c8fc
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -57,6 +57,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10350. BUILDING.txt should mention openssl dependency required HADOOP-10350. BUILDING.txt should mention openssl dependency required
for hadoop-pipes (Vinayakumar B) for hadoop-pipes (Vinayakumar B)
HADOOP-10495. TestFileUtil fails on Windows due to bad permission
assertions. (cnauroth)
Release 2.4.1 - UNRELEASED Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
View File

@ -589,7 +589,7 @@ public class TestFileUtil {
// should never happen since that method never throws InterruptedException. // should never happen since that method never throws InterruptedException.
assertNull(ie); assertNull(ie);
} }
assertFalse(notADirectory.canRead()); assertFalse(FileUtil.canRead(notADirectory));
final long du3 = FileUtil.getDU(partitioned); final long du3 = FileUtil.getDU(partitioned);
assertEquals(expected, du3); assertEquals(expected, du3);
@ -600,7 +600,7 @@ public class TestFileUtil {
// should never happen since that method never throws InterruptedException. // should never happen since that method never throws InterruptedException.
assertNull(ie); assertNull(ie);
} }
assertFalse(partitioned.canRead()); assertFalse(FileUtil.canRead(partitioned));
final long du4 = FileUtil.getDU(partitioned); final long du4 = FileUtil.getDU(partitioned);
assertEquals(0, du4); assertEquals(0, du4);
} finally { } finally {