svn commit: r1411072 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java

[ma...@apache.org]

Author: mattf
Date: Mon Nov 19 05:58:25 2012
New Revision: 1411072

URL: http://svn.apache.org/viewvc?rev=1411072&view=rev
Log:
MAPREDUCE-4792. Unit Test TestJobTrackerRestartWithLostTracker fails with ant-1.8.4. Contributed by Amir Sanjar.

Modified:
    hadoop/common/branches/branch-1.1/CHANGES.txt
    hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1411072&r1=1411071&r2=1411072&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Mon Nov 19 05:58:25 2012
@@ -51,6 +51,9 @@ Release 1.1.1 - Unreleased
     HDFS-4105. the SPNEGO user for secondary namenode should use the web 
     keytab. (Arpit Gupta via jitendra)
 
+    MAPREDUCE-4792. Unit Test TestJobTrackerRestartWithLostTracker fails 
+    with ant-1.8.4. (Amir Sanjar via mattf)
+
 Release 1.1.0 - 2012.09.28
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java?rev=1411072&r1=1411071&r2=1411072&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java (original)
+++ hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java Mon Nov 19 05:58:25 2012
@@ -17,21 +17,24 @@
  */
 package org.apache.hadoop.mapred;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.*;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.mapred.TestJobTrackerRestart;
+import org.junit.Test;
+
 
-import junit.framework.TestCase;
 import java.io.*;
-import org.junit.*;
+
 
 /** 
  * This test checks if the jobtracker can detect and recover a tracker that was
  * lost while the jobtracker was down.
  */
 
-public class TestJobTrackerRestartWithLostTracker extends TestCase {
+public class TestJobTrackerRestartWithLostTracker {
   final Path testDir = new Path("/jt-restart-lost-tt-testing");
   final Path inDir = new Path(testDir, "input");
   final Path shareDir = new Path(testDir, "share");
@@ -114,7 +117,7 @@ public class TestJobTrackerRestartWithLo
 
     assertTrue("Job should be successful", rJob.isSuccessful());
   }
-  
+  @Test
   public void testRestartWithLostTracker() throws IOException {
     String namenode = null;
     MiniDFSCluster dfs = null;