svn commit: r704703 - in /hadoop/core/trunk: CHANGES.txt src/test/org/apache/hadoop/mapred/TestJobQueueInformation.java

[ac...@apache.org]

Author: acmurthy
Date: Tue Oct 14 14:52:36 2008
New Revision: 704703

URL: http://svn.apache.org/viewvc?rev=704703&view=rev
Log:
HADOOP-4378. Fix TestJobQueueInformation to use SleepJob rather than WordCount via TestMiniMRWithDFS. Contributed by Sreekanth Ramakrishnan.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestJobQueueInformation.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=704703&r1=704702&r2=704703&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Oct 14 14:52:36 2008
@@ -908,6 +908,9 @@
     HADOOP-4403. Make TestLeaseRecovery and TestFileCreation more robust.
     (szetszwo)
 
+    HADOOP-4378. Fix TestJobQueueInformation to use SleepJob rather than
+    WordCount via TestMiniMRWithDFS. (Sreekanth Ramakrishnan via acmurthy) 
+
 Release 0.18.2 - Unreleased
 
   BUG FIXES

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestJobQueueInformation.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestJobQueueInformation.java?rev=704703&r1=704702&r2=704703&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestJobQueueInformation.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestJobQueueInformation.java Tue Oct 14 14:52:36 2008
@@ -28,6 +28,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.examples.SleepJob;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.ipc.RPC;
 import org.apache.hadoop.net.NetUtils;
@@ -87,7 +88,11 @@
     assertNotNull(queueInfos);
     assertEquals(1, queueInfos.length);
     assertEquals("default", queueInfos[0].getQueueName());
-    TestMiniMRWithDFS.runWordCount(mrCluster, mrCluster.createJobConf());
+    JobConf conf = mrCluster.createJobConf();
+    SleepJob sleepJob = new SleepJob();
+    sleepJob.setConf(conf);
+    conf = sleepJob.setupJobConf(4, 2, 1, 1, 1, 1);
+    JobClient.runJob(conf);
     int numberOfJobs = 0;
 
     for (JobQueueInfo queueInfo : queueInfos) {
@@ -101,7 +106,6 @@
         assertEquals(JOB_SCHEDULING_INFO, status.getSchedulingInfo());
       }
     }
-    // Three jobs are launched by runwordcount
-    assertEquals(3, numberOfJobs);
+    assertEquals(1, numberOfJobs);
   }
 }