diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 12276d43b97..f5b4c9a496c 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -377,6 +377,9 @@ Release 2.0.3-alpha - Unreleased HADOOP-8900. BuiltInGzipDecompressor throws IOException - stored gzip size doesn't match decompressed size. (Slavik Krassovsky via suresh) + HADOOP-8948. TestFileUtil.testGetDU fails on Windows due to incorrect + assumption of line separator. (Chris Nauroth via suresh) + Release 2.0.2-alpha - 2012-09-07 INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java index 0b74baeb6e7..90db2d0526b 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java @@ -472,7 +472,9 @@ public class TestFileUtil { setupDirs(); long du = FileUtil.getDU(TEST_DIR); - //Only two files (in partitioned) have 4 bytes each - Assert.assertEquals(du, 8); + // Only two files (in partitioned). Each has 3 characters + system-specific + // line separator. + long expected = 2 * (3 + System.getProperty("line.separator").length()); + Assert.assertEquals(expected, du); } }