Parcourir la source

HADOOP-8948. TestFileUtil.testGetDU fails on Windows due to incorrect assumption of line separator. Contributed by Chris Nauroth.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1400324 13f79535-47bb-0310-9956-ffa450edef68
Suresh Srinivas il y a 12 ans
Parent
commit
efd798b34b

+ 3 - 0
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
     HADOOP-8900. BuiltInGzipDecompressor throws IOException - stored gzip size
     doesn't match decompressed size. (Slavik Krassovsky via suresh)
     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 
 Release 2.0.2-alpha - 2012-09-07 
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 4 - 2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java

@@ -472,7 +472,9 @@ public class TestFileUtil {
     setupDirs();
     setupDirs();
 
 
     long du = FileUtil.getDU(TEST_DIR);
     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);
   }
   }
 }
 }