svn commit: r1079226 - /hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapreduce/TestMapReduceLocal.java

[om...@apache.org]

Author: omalley
Date: Tue Mar  8 05:57:58 2011
New Revision: 1079226

URL: http://svn.apache.org/viewvc?rev=1079226&view=rev
Log:
commit 88d5052eef05c9d87a977393ae022d8335b937ae
Author: Greg Roelofs <ro...@yahoo-inc.com>
Date:   Fri Dec 17 20:51:53 2010 -0800

    Correct disable-ubermode fix for TestMapReduceLocal (moved conf modification
    before job creation).

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

Modified: hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapreduce/TestMapReduceLocal.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapreduce/TestMapReduceLocal.java?rev=1079226&r1=1079225&r2=1079226&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapreduce/TestMapReduceLocal.java (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/test/mapred/org/apache/hadoop/mapreduce/TestMapReduceLocal.java Tue Mar  8 05:57:58 2011
@@ -130,6 +130,7 @@ public class TestMapReduceLocal extends 
     localFs.delete(new Path(TEST_ROOT_DIR + "/out"), true);    
     writeFile("in/part1", "this is a test\nof word count test\ntest\n");
     writeFile("in/part2", "more test");
+    conf.setBoolean(JobContext.JOB_UBERTASK_ENABLE, false);
     Job job = Job.getInstance(conf, "word count");     
     job.setJarByClass(WordCount.class);
     job.setMapperClass(TokenizerMapper.class);
@@ -138,7 +139,6 @@ public class TestMapReduceLocal extends 
     job.setOutputKeyClass(Text.class);
     job.setOutputValueClass(IntWritable.class);
     job.setInputFormatClass(TrackingTextInputFormat.class);
-    conf.setBoolean(JobContext.JOB_UBERTASK_ENABLE, false);
     FileInputFormat.addInputPath(job, new Path(TEST_ROOT_DIR + "/in"));
     FileOutputFormat.setOutputPath(job, new Path(TEST_ROOT_DIR + "/out"));
     assertTrue(job.waitForCompletion(false));