Author: cnauroth
Date: Mon Apr 14 04:14:57 2014
New Revision: 1587138
URL: http://svn.apache.org/r1587138
Log:
HADOOP-10495. Merging change r1587137 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1587138&r1=1587137&r2=1587138&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Mon Apr 14 04:14:57 2014
@@ -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
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java?rev=1587138&r1=1587137&r2=1587138&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
Mon Apr 14 04:14:57 2014
@@ -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 {
