Author: todd
Date: Tue Jan 25 22:58:21 2011
New Revision: 1063504
URL: http://svn.apache.org/viewvc?rev=1063504&view=rev
Log:
MAPREDUCE-2277. TestCapacitySchedulerWithJobTracker needs to wait for jobs to
complete before testing status. Contributed by Todd Lipcon
Modified:
hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
hadoop/mapreduce/branches/branch-0.22/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacitySchedulerWithJobTracker.java
Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1063504&r1=1063503&r2=1063504&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Tue Jan 25 22:58:21 2011
@@ -433,6 +433,9 @@ Release 0.22.0 - Unreleased
MAPREDUCE-2238. Fix permissions handling to avoid leaving undeletable
directories
in local dirs. (todd)
+ MAPREDUCE-2277. TestCapacitySchedulerWithJobTracker needs to wait for jobs
to
+ complete before testing status. (todd)
+
Release 0.21.1 - Unreleased
NEW FEATURES
Modified:
hadoop/mapreduce/branches/branch-0.22/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacitySchedulerWithJobTracker.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacitySchedulerWithJobTracker.java?rev=1063504&r1=1063503&r2=1063504&view=diff
==============================================================================
---
hadoop/mapreduce/branches/branch-0.22/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacitySchedulerWithJobTracker.java
(original)
+++
hadoop/mapreduce/branches/branch-0.22/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacitySchedulerWithJobTracker.java
Tue Jan 25 22:58:21 2011
@@ -124,6 +124,7 @@ public class TestCapacitySchedulerWithJo
SleepJob sleepJob2 = new SleepJob();
sleepJob2.setConf(conf2);
jobs[1] = sleepJob2.createJob(3, 3, 5, 3, 5, 3);
+ jobs[0].waitForCompletion(false);
jobs[1].waitForCompletion(false);
assertTrue(
"Sleep job submitted to queue 1 is not successful", jobs[0]
