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 ac...@apache.org on 2012/02/02 00:05:15 UTC
svn commit: r1239391 - in
/hadoop/common/trunk/hadoop-tools/hadoop-streaming: pom.xml
src/test/java/org/apache/hadoop/streaming/TestStreamingBadRecords.java
src/test/java/org/apache/hadoop/streaming/TestUlimit.java
Author: acmurthy
Date: Wed Feb 1 23:05:14 2012
New Revision: 1239391
URL: http://svn.apache.org/viewvc?rev=1239391&view=rev
Log:
MAPREDUCE-3427. Fix streaming unit tests broken after mavenization. Contributed by Hitesh Shah.
Modified:
hadoop/common/trunk/hadoop-tools/hadoop-streaming/pom.xml
hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBadRecords.java
hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUlimit.java
Modified: hadoop/common/trunk/hadoop-tools/hadoop-streaming/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-streaming/pom.xml?rev=1239391&r1=1239390&r2=1239391&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/hadoop-streaming/pom.xml (original)
+++ hadoop/common/trunk/hadoop-tools/hadoop-streaming/pom.xml Wed Feb 1 23:05:14 2012
@@ -29,7 +29,7 @@
<properties>
<hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
- <test.exclude.pattern>%regex[.*(TestStreamingBadRecords|TestStreamingStatus|TestUlimit).*]</test.exclude.pattern>
+ <test.exclude.pattern>%regex[.*(TestStreamingStatus).*]</test.exclude.pattern>
</properties>
<dependencies>
Modified: hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBadRecords.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBadRecords.java?rev=1239391&r1=1239390&r2=1239391&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBadRecords.java (original)
+++ hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBadRecords.java Wed Feb 1 23:05:14 2012
@@ -154,6 +154,10 @@ public class TestStreamingBadRecords ext
}
}
+ /*
+ * Disable test as skipping bad records not supported in 0.23
+ */
+ /*
public void testSkip() throws Exception {
JobConf clusterConf = createJobConf();
createInput();
@@ -195,7 +199,12 @@ public class TestStreamingBadRecords ext
//validate that there is no skip directory as it has been set to "none"
assertTrue(SkipBadRecords.getSkipOutputPath(job.jobConf_)==null);
}
+ */
+ /*
+ * Disable test as skipping bad records not supported in 0.23
+ */
+ /*
public void testNarrowDown() throws Exception {
createInput();
JobConf clusterConf = createJobConf();
@@ -231,6 +240,11 @@ public class TestStreamingBadRecords ext
validateOutput(job.running_, true);
assertTrue(SkipBadRecords.getSkipOutputPath(job.jobConf_)!=null);
}
+ */
+
+ public void testNoOp() {
+ // Added to avoid warnings when running this disabled test
+ }
static class App{
boolean isReducer;
Modified: hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUlimit.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUlimit.java?rev=1239391&r1=1239390&r2=1239391&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUlimit.java (original)
+++ hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUlimit.java Wed Feb 1 23:05:14 2012
@@ -31,6 +31,7 @@ import org.apache.hadoop.mapreduce.MapRe
import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
import org.apache.hadoop.util.StringUtils;
+import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -52,7 +53,6 @@ public class TestUlimit {
private static String SET_MEMORY_LIMIT = "786432"; // 768MB
String[] genArgs(String memLimit) {
- String strJobtracker = JTConfig.JT_IPC_ADDRESS + "=localhost:" + mr.createJobConf().get(JTConfig.JT_IPC_ADDRESS);
String strNamenode = "fs.default.name=" + mr.createJobConf().get("fs.default.name");
return new String[] {
"-input", inputPath.toString(),
@@ -63,7 +63,6 @@ public class TestUlimit {
"-jobconf", MRJobConfig.NUM_MAPS + "=1",
"-jobconf", JobConf.MAPRED_MAP_TASK_ULIMIT + "=" + memLimit,
"-jobconf", strNamenode,
- "-jobconf", strJobtracker,
"-jobconf", "stream.tmpdir=" +
System.getProperty("test.build.data","/tmp"),
"-jobconf", "mapred.jar=" + TestStreaming.STREAMING_JAR,
@@ -79,6 +78,7 @@ public class TestUlimit {
* is expected to be a failure.
*/
@Test
+ @Ignore
public void testCommandLine() {
if (UtilTest.isCygwin()) {
return;