Merge -r 705144:705145 from trunk onto 0.19 branch. Fixes HADOOP-4426.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.19@705146 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -878,6 +878,9 @@ Release 0.19.0 - Unreleased
     HADOOP-4335. Fix FsShell -ls for filesystems without owners/groups. (David
     Phillips via cdouglas)
 
+    HADOOP-4426. TestCapacityScheduler broke due to the two commits HADOOP-4053
+    and HADOOP-4373. This patch fixes that. (Hemanth Yamijala via ddas)
+
 Release 0.18.2 - Unreleased
 
   BUG FIXES

src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java

@@ -468,7 +468,7 @@ public class TestCapacityScheduler extends TestCase {
     taskTrackerManager.addQueues(new String[] {"default"});
     resConf = new FakeResourceManagerConf();
     ArrayList<FakeQueueInfo> queues = new ArrayList<FakeQueueInfo>();
-    queues.add(new FakeQueueInfo("default", 1f, 1, true, 1));
+    queues.add(new FakeQueueInfo("default", 100.0f, 1, true, 1));
     resConf.setFakeQueues(queues);
     scheduler.setResourceManagerConf(resConf);
     scheduler.start();
@@ -656,10 +656,10 @@ public class TestCapacityScheduler extends TestCase {
     scheduler.start();
    
     // submit a job to the default queue
-    submitJob(JobStatus.PREP, 10, 0, "default", "u1");
+    submitJobAndInit(JobStatus.PREP, 10, 0, "default", "u1");
     
     // submit a job to the second queue
-    submitJob(JobStatus.PREP, 10, 0, "q2", "u1");
+    submitJobAndInit(JobStatus.PREP, 10, 0, "q2", "u1");
     
     // job from q2 runs first because it has some non-zero capacity.
     checkAssignment("tt1", "attempt_test_0002_m_000001_0 on tt1");