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:
parent
1134ccdb0d
commit
065a09c8fc
|
@ -57,6 +57,9 @@ Release 2.5.0 - UNRELEASED
|
|||
HADOOP-10350. BUILDING.txt should mention openssl dependency required
|
||||
for hadoop-pipes (Vinayakumar B)
|
||||
|
||||
HADOOP-10495. TestFileUtil fails on Windows due to bad permission
|
||||
assertions. (cnauroth)
|
||||
|
||||
Release 2.4.1 - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -589,7 +589,7 @@ public class TestFileUtil {
|
|||
// should never happen since that method never throws InterruptedException.
|
||||
assertNull(ie);
|
||||
}
|
||||
assertFalse(notADirectory.canRead());
|
||||
assertFalse(FileUtil.canRead(notADirectory));
|
||||
final long du3 = FileUtil.getDU(partitioned);
|
||||
assertEquals(expected, du3);
|
||||
|
||||
|
@ -600,7 +600,7 @@ public class TestFileUtil {
|
|||
// should never happen since that method never throws InterruptedException.
|
||||
assertNull(ie);
|
||||
}
|
||||
assertFalse(partitioned.canRead());
|
||||
assertFalse(FileUtil.canRead(partitioned));
|
||||
final long du4 = FileUtil.getDU(partitioned);
|
||||
assertEquals(0, du4);
|
||||
} finally {
|
||||
|
|
Loading…
Reference in New Issue