You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2013/04/10 03:31:45 UTC

svn commit: r1466310 - in /hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming: TestStreamReduceNone.java TestStreamXmlRecordReader.java

Author: vinodkv
Date: Wed Apr 10 01:31:44 2013
New Revision: 1466310

URL: http://svn.apache.org/r1466310
Log:
MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994. Contributed by Sandy Ryza.
svn merge --ignore-ancestry -c 1461541 ../../trunk/

Modified:
    hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamReduceNone.java
    hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamXmlRecordReader.java

Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamReduceNone.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamReduceNone.java?rev=1466310&r1=1466309&r2=1466310&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamReduceNone.java (original)
+++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamReduceNone.java Wed Apr 10 01:31:44 2013
@@ -68,6 +68,7 @@ public class TestStreamReduceNone
       "-reducer", "org.apache.hadoop.mapred.lib.IdentityReducer",
       "-numReduceTasks", "0",
       "-jobconf", "mapreduce.task.files.preserve.failedtasks=true",
+      "-jobconf", "mapreduce.job.maps=1",
       "-jobconf", "stream.tmpdir="+System.getProperty("test.build.data","/tmp")
     };
   }

Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamXmlRecordReader.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamXmlRecordReader.java?rev=1466310&r1=1466309&r2=1466310&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamXmlRecordReader.java (original)
+++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamXmlRecordReader.java Wed Apr 10 01:31:44 2013
@@ -54,6 +54,8 @@ public class TestStreamXmlRecordReader e
   protected String[] genArgs() {
     args.add("-inputreader");
     args.add("StreamXmlRecordReader,begin=<xmltag>,end=</xmltag>");
+    args.add("-jobconf");
+    args.add("mapreduce.job.maps=1");
     return super.genArgs();
   }
 }