瀏覽代碼

svn merge -c 1310431 from trunk. FIXES: MAPREDUCE-4111. Fix tests in org.apache.hadoop.mapred.TestJobName (Devaraj K via bobby)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310432 13f79535-47bb-0310-9956-ffa450edef68
Robert Joseph Evans 13 年之前
父節點
當前提交
6514ecce13

+ 3 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -111,6 +111,9 @@ Release 2.0.0 - UNRELEASED
 
     MAPREDUCE-4112. Fix tests org.apache.hadoop.mapred.TestClusterMapReduceTestCase
     (Devaraj K via bobby)
+
+    MAPREDUCE-4111. Fix tests in org.apache.hadoop.mapred.TestJobName (Devaraj
+    K via bobby)
  
 Release 0.23.3 - UNRELEASED
 

+ 0 - 6
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobName.java

@@ -18,23 +18,17 @@
 package org.apache.hadoop.mapred;
 
 import java.io.BufferedReader;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
-import java.util.Iterator;
-import java.util.StringTokenizer;
 
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.serializer.JavaSerializationComparator;
 import org.apache.hadoop.mapred.lib.IdentityMapper;
-import org.junit.Ignore;
-@Ignore
 public class TestJobName extends ClusterMapReduceTestCase {
 
   public void testComplexName() throws Exception {