hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acmur...@apache.org
Subject svn commit: r1189672 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java
Date Thu, 27 Oct 2011 08:32:18 GMT
Author: acmurthy
Date: Thu Oct 27 08:32:18 2011
New Revision: 1189672

URL: http://svn.apache.org/viewvc?rev=1189672&view=rev
Log:
Merge -c 1189670 from trunk to branch-0.23 to fix MAPREDUCE-3279.

Modified:
    hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
    hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java

Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1189672&r1=1189671&r2=1189672&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu Oct 27 08:32:18
2011
@@ -1740,6 +1740,9 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-3259. Added java.library.path of NodeManager to
     ContainerLocalizer in LinuxContainerExecutor. (Kihwal Lee via acmurthy) 
 
+    MAPREDUCE-3279. Fixed TestJobHistoryParsing which assumed user name to be
+    mapred all the time. (Siddharth Seth via acmurthy)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java?rev=1189672&r1=1189671&r2=1189672&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java
Thu Oct 27 08:32:18 2011
@@ -95,7 +95,8 @@ public class TestJobHistoryParsing {
     JobHistoryParser parser = new JobHistoryParser(in);
     JobInfo jobInfo = parser.parse();
 
-    Assert.assertEquals("Incorrect username ", "mapred", jobInfo.getUsername());
+    Assert.assertEquals("Incorrect username ", System.getProperty("user.name"),
+        jobInfo.getUsername());
     Assert.assertEquals("Incorrect jobName ", "test", jobInfo.getJobname());
     Assert.assertEquals("Incorrect queuename ", "default",
         jobInfo.getJobQueueName());
@@ -182,7 +183,7 @@ public class TestJobHistoryParsing {
         Integer.parseInt(jobSummaryElements.get("numMaps")));
     Assert.assertEquals("Mismatch in num reduce slots", 1,
         Integer.parseInt(jobSummaryElements.get("numReduces")));
-    Assert.assertEquals("User does not match", "mapred",
+    Assert.assertEquals("User does not match", System.getProperty("user.name"),
         jobSummaryElements.get("user"));
     Assert.assertEquals("Queue does not match", "default",
         jobSummaryElements.get("queue"));



Mime
View raw message