svn commit: r1090390 - in /hadoop/mapreduce/trunk: CHANGES.txt src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java

[to...@apache.org]

Author: todd
Date: Fri Apr  8 18:26:54 2011
New Revision: 1090390

URL: http://svn.apache.org/viewvc?rev=1090390&view=rev
Log:
MAPREDUCE-2426. Make TestFairSchedulerSystem fail with more verbose output. Contributed by Todd Lipcon.

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1090390&r1=1090389&r2=1090390&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Apr  8 18:26:54 2011
@@ -124,6 +124,9 @@ Trunk (unreleased changes)
     MAPREDUCE-2395. TestBlockFixer timing out on trunk. (Ramkumar Vadali via
     todd)
 
+    MAPREDUCE-2426. Make TestFairSchedulerSystem fail with more verbose output
+    (todd)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/mapreduce/trunk/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java?rev=1090390&r1=1090389&r2=1090390&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java (original)
+++ hadoop/mapreduce/trunk/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java Fri Apr  8 18:26:54 2011
@@ -155,7 +155,8 @@ public class TestFairSchedulerSystem {
     }
 
     String contents = sb.toString();
-    assertTrue(contents.contains("Fair Scheduler Administration"));
+    assertTrue("Bad contents for fair scheduler servlet: " + contents,
+      contents.contains("Fair Scheduler Administration"));
   }
 
   private void checkTaskGraphServlet(JobID job) throws Exception {
@@ -169,7 +170,8 @@ public class TestFairSchedulerSystem {
 
     // Just to be sure, slurp the content and make sure it looks like the scheduler
     String contents = slurpContents(connection);
-    assertTrue(contents.contains("</svg>"));
+    assertTrue("Bad contents for job " + job + ":\n" + contents,
+      contents.contains("</svg>"));
   }
 
   private String slurpContents(HttpURLConnection connection) throws Exception {