You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by om...@apache.org on 2011/03/08 07:00:47 UTC

svn commit: r1079254 - in /hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapred: TestJobQueueInformation.java TestSetupAndCleanupFailure.java

Author: omalley
Date: Tue Mar  8 06:00:47 2011
New Revision: 1079254

URL: http://svn.apache.org/viewvc?rev=1079254&view=rev
Log:
commit 8ba61c1eb9fec1f56a6acecc952353d2afd4a8bb
Author: Greg Roelofs <ro...@yahoo-inc.com>
Date:   Tue Jan 25 15:28:37 2011 -0800

    Added assert messages for two "mixed-mode" unit tests (both formerly failed
    on same assert in both uber and non-uber mode [at least, according to my
    notes]; now uber still does but non-uber times out.  Since _probably_ not
    uber-specific problem, leaving actual fix(es) for later.

Modified:
    hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueInformation.java
    hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapred/TestSetupAndCleanupFailure.java

Modified: hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueInformation.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueInformation.java?rev=1079254&r1=1079253&r2=1079254&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueInformation.java (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueInformation.java Tue Mar  8 06:00:47 2011
@@ -133,7 +133,8 @@ public class TestJobQueueInformation ext
       assertEquals(expectedQueueInfo, queueInfo.getSchedulingInfo());
       numberOfJobs += jobStatusList.length;
       for (JobStatus status : jobStatusList) {
-        assertEquals(JOB_SCHEDULING_INFO, status.getSchedulingInfo());
+        assertEquals("Custom JobStatus scheduling info not found.",
+                     JOB_SCHEDULING_INFO, status.getSchedulingInfo());
       }
     }
     assertEquals(1, numberOfJobs);

Modified: hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapred/TestSetupAndCleanupFailure.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapred/TestSetupAndCleanupFailure.java?rev=1079254&r1=1079253&r2=1079254&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapred/TestSetupAndCleanupFailure.java (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapred/TestSetupAndCleanupFailure.java Tue Mar  8 06:00:47 2011
@@ -115,7 +115,7 @@ public class TestSetupAndCleanupFailure 
     RunningJob job = UtilsForTests.runJob(jobConf, inDir, outDir);
     // wait for the job to finish.
     job.waitForCompletion();
-    assertEquals(JobStatus.FAILED, job.getJobState());
+    assertEquals("job didn't fail!", JobStatus.FAILED, job.getJobState());
   }
   
   // launch job with CommitterWithLongSetupAndCleanup as committer