You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2012/10/20 00:55:20 UTC
svn commit: r1400327 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
CHANGES.txt src/test/java/org/apache/hadoop/fs/TestFileUtil.java
Author: suresh
Date: Fri Oct 19 22:55:20 2012
New Revision: 1400327
URL: http://svn.apache.org/viewvc?rev=1400327&view=rev
Log:
HDFS-8948. Merging change 1400324 from trunk.
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=1400327&r1=1400326&r2=1400327&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 Fri Oct 19 22:55:20 2012
@@ -107,6 +107,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
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=1400327&r1=1400326&r2=1400327&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 Fri Oct 19 22:55:20 2012
@@ -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);
}
}