From 337f4f4e798ea675cd57348212857ce051e857ff Mon Sep 17 00:00:00 2001
From: Vinod Kumar Vavilapalli <vinodkv@apache.org>
Date: Fri, 4 Nov 2011 09:03:33 +0000
Subject: [PATCH] MAPREDUCE-3217. Reenabled and fixed bugs in the failing ant
 test TestAuditLogger. Contributed by Devaraj K. svn merge -c r1197438
 --ignore-ancestry ../../trunk/

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1197441 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt                       | 3 +++
 .../mapred/org/apache/hadoop/mapred/TestAuditLogger.java   | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index dbf5096ba71..ca3ca255822 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -25,6 +25,9 @@ Release 0.23.1 - Unreleased
     MAPREDUCE-3219. Reenabled and fixed bugs in the failing test
     TestDelegationToken. (Hitesh Shah via vinodkv)
 
+    MAPREDUCE-3217. Reenabled and fixed bugs in the failing ant test
+    TestAuditLogger. (Devaraj K via vinodkv)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestAuditLogger.java b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestAuditLogger.java
index 145442071d8..a6aebb0e4ed 100644
--- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestAuditLogger.java
+++ b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestAuditLogger.java
@@ -21,6 +21,7 @@
 import java.net.InetSocketAddress;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.ipc.ProtocolInfo;
 import org.apache.hadoop.ipc.RPC;
 import org.apache.hadoop.ipc.Server;
 import org.apache.hadoop.ipc.TestRPC.TestImpl;
@@ -123,6 +124,7 @@ public void testAuditLoggerWithoutIP() throws Exception {
    * A special extension of {@link TestImpl} RPC server with
    * {@link TestImpl#ping()} testing the audit logs.
    */
+  @ProtocolInfo(protocolName = "org.apache.hadoop.ipc.TestRPC$TestProtocol")
   private class MyTestRPCServer extends TestImpl {
     @Override
     public void ping() {
@@ -135,10 +137,8 @@ public void ping() {
   /**
    * Test {@link AuditLogger} with IP set.
    */
+  @SuppressWarnings("deprecation")
   public void testAuditLoggerWithIP() throws Exception {
-    /*
-    // TODO
-    // Disable test to address build failures.
     Configuration conf = new Configuration();
     // start the IPC server
     Server server = RPC.getServer(new MyTestRPCServer(), "0.0.0.0", 0, conf);
@@ -153,6 +153,5 @@ public void testAuditLoggerWithIP() throws Exception {
     proxy.ping();
 
     server.stop();
-    */
   }
 }