Browse Source

Backport of
HADOOP-9405. TestGridmixSummary#testExecutionSummarizer is broken



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.0.4-alpha@1463292 13f79535-47bb-0310-9956-ffa450edef68

Konstantin Boudnik 12 years ago
parent
commit
5a1f3fb54a

+ 3 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -95,6 +95,9 @@ Release 2.0.4-alpha - UNRELEASED
     HADOOP-9444. Modify hadoop-policy.xml to replace unexpanded variables to a
     HADOOP-9444. Modify hadoop-policy.xml to replace unexpanded variables to a
     default value of '*'. (Roman Shaposhnik via vinodkv)
     default value of '*'. (Roman Shaposhnik via vinodkv)
 
 
+    HADOOP-9405. TestGridmixSummary#testExecutionSummarizer is broken.
+    (Andrew Wang via atm)
+
 Release 2.0.3-alpha - 2013-02-06 
 Release 2.0.3-alpha - 2013-02-06 
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 3 - 3
hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java

@@ -247,7 +247,7 @@ public class TestGridmixSummary {
                  qPath.toString(), es.getInputTraceLocation());
                  qPath.toString(), es.getInputTraceLocation());
     // test expected data size
     // test expected data size
     assertEquals("Mismatch in expected data size", 
     assertEquals("Mismatch in expected data size", 
-                 "1.0k", es.getExpectedDataSize());
+                 "1 K", es.getExpectedDataSize());
     // test input data statistics
     // test input data statistics
     assertEquals("Mismatch in input data statistics", 
     assertEquals("Mismatch in input data statistics", 
                  ExecutionSummarizer.stringifyDataStatistics(dataStats), 
                  ExecutionSummarizer.stringifyDataStatistics(dataStats), 
@@ -262,7 +262,7 @@ public class TestGridmixSummary {
     es.finalize(factory, testTraceFile.toString(), 1024*1024*1024*10L, resolver,
     es.finalize(factory, testTraceFile.toString(), 1024*1024*1024*10L, resolver,
                 dataStats, conf);
                 dataStats, conf);
     assertEquals("Mismatch in expected data size", 
     assertEquals("Mismatch in expected data size", 
-                 "10.0g", es.getExpectedDataSize());
+                 "10 G", es.getExpectedDataSize());
     
     
     // test trace signature uniqueness
     // test trace signature uniqueness
     //  touch the trace file
     //  touch the trace file
@@ -374,4 +374,4 @@ public class TestGridmixSummary {
     assertEquals("Cluster summary test failed!", 0, 
     assertEquals("Cluster summary test failed!", 0, 
                  cs.getNumBlacklistedTrackers());
                  cs.getNumBlacklistedTrackers());
   }
   }
-}
+}