svn commit: r792901 - in /hadoop/mapreduce/trunk: CHANGES.txt src/test/mapred/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java src/test/mapred/org/apache/hadoop/mapred/TestCustomOutputCommitter.java

[sh...@apache.org]

Author: sharad
Date: Fri Jul 10 12:01:46 2009
New Revision: 792901

URL: http://svn.apache.org/viewvc?rev=792901&view=rev
Log:
MAPREDUCE-632. Merge TestCustomOutputCommitter with TestCommandLineJobSubmission. Contributed by Jothi Padmanabhan.

Removed:
    hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestCustomOutputCommitter.java
Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=792901&r1=792900&r2=792901&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Jul 10 12:01:46 2009
@@ -93,6 +93,9 @@
     MAPREDUCE-655. Change KeyValueLineRecordReader and KeyValueTextInputFormat
     to use new mapreduce api. (Amareshwari Sriramadasu via sharad)
 
+    MAPREDUCE-632. Merge TestCustomOutputCommitter with 
+    TestCommandLineJobSubmission. (Jothi Padmanabhan via sharad)
+
   BUG FIXES
     MAPREDUCE-703. Sqoop requires dependency on hsqldb in ivy.
     (Aaron Kimball via matei)

Modified: hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java?rev=792901&r1=792900&r2=792901&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java (original)
+++ hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java Fri Jul 10 12:01:46 2009
@@ -59,15 +59,17 @@
       FileOutputStream fstream = new FileOutputStream(f);
       fstream.write("somestrings".getBytes());
       fstream.close();
-      String[] args = new String[6];
+      String[] args = new String[8];
       args[0] = "-files";
       args[1] = f.toString();
       args[2] = "-libjars";
       // the testjob.jar as a temporary jar file 
       // rather than creating its own
       args[3] = "build/test/mapred/testjar/testjob.jar";
-      args[4] = input.toString();
-      args[5] = output.toString();
+      args[4] = "-D";
+      args[5] = "mapred.output.committer.class=testjar.CustomOutputCommitter";
+      args[6] = input.toString();
+      args[7] = output.toString();
       
       JobConf jobConf = mr.createJobConf();
       //before running the job, verify that libjar is not in client classpath