hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vino...@apache.org
Subject svn commit: r1179326 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java
Date Wed, 05 Oct 2011 17:10:38 GMT
Author: vinodkv
Date: Wed Oct  5 17:10:38 2011
New Revision: 1179326

URL: http://svn.apache.org/viewvc?rev=1179326&view=rev
Log:
MAPREDUCE-2913. svn merge -c r1179319 --ignore-ancestry ../../trunk/

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-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.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=1179326&r1=1179325&r2=1179326&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 Wed Oct  5 17:10:38
2011
@@ -1494,6 +1494,9 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-3056. Changed the default staging directory to not include
     user.name to prevent issues with non-secure mode. (Devaraj K via vinodkv)
 
+    MAPREDUCE-2913. Fixed TestMRJobs.testFailingMapper to assert the correct
+    TaskCompletionEventStatus. (Jonathan Eagles via vinodkv)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java?rev=1179326&r1=1179325&r2=1179326&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java
Wed Oct  5 17:10:38 2011
@@ -273,9 +273,9 @@ public class TestMRJobs {
     
     TaskCompletionEvent[] events = job.getTaskCompletionEvents(0, 2);
     Assert.assertEquals(TaskCompletionEvent.Status.FAILED, 
-        events[0].getStatus().FAILED);
-    Assert.assertEquals(TaskCompletionEvent.Status.FAILED, 
-        events[1].getStatus().FAILED);
+        events[0].getStatus());
+    Assert.assertEquals(TaskCompletionEvent.Status.TIPFAILED, 
+        events[1].getStatus());
     Assert.assertEquals(JobStatus.State.FAILED, job.getJobState());
     verifyFailingMapperCounters(job);
 



Mime
View raw message