svn commit: r1130758 - in /hadoop/common/trunk: CHANGES.txt src/test/core/org/apache/hadoop/ipc/TestIPC.java

[to...@apache.org]

Author: todd
Date: Thu Jun  2 19:23:43 2011
New Revision: 1130758

URL: http://svn.apache.org/viewvc?rev=1130758&view=rev
Log:
HADOOP-7349. HADOOP-7121 accidentally disabled some tests in TestIPC. Contributed by Todd Lipcon.

Modified:
    hadoop/common/trunk/CHANGES.txt
    hadoop/common/trunk/src/test/core/org/apache/hadoop/ipc/TestIPC.java

Modified: hadoop/common/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1130758&r1=1130757&r2=1130758&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Thu Jun  2 19:23:43 2011
@@ -763,6 +763,9 @@ Release 0.22.0 - Unreleased
     so subclasses could supply alternate webapps path but it was made private
     by HADOOP-6461 (Stack)
 
+    HADOOP-7349. HADOOP-7121 accidentally disabled some tests in TestIPC.
+    (todd)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/common/trunk/src/test/core/org/apache/hadoop/ipc/TestIPC.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/core/org/apache/hadoop/ipc/TestIPC.java?rev=1130758&r1=1130757&r2=1130758&view=diff
==============================================================================
--- hadoop/common/trunk/src/test/core/org/apache/hadoop/ipc/TestIPC.java (original)
+++ hadoop/common/trunk/src/test/core/org/apache/hadoop/ipc/TestIPC.java Thu Jun  2 19:23:43 2011
@@ -445,6 +445,7 @@ public class TestIPC {
    * Test that, if the socket factory throws an IOE, it properly propagates
    * to the client.
    */
+  @Test
   public void testSocketFactoryException() throws Exception {
     SocketFactory mockFactory = mock(SocketFactory.class);
     doThrow(new IOException("Injected fault")).when(mockFactory).createSocket();
@@ -460,6 +461,7 @@ public class TestIPC {
     }
   }
 
+  @Test
   public void testIpcTimeout() throws Exception {
     // start server
     Server server = new TestServer(1, true);
@@ -485,6 +487,7 @@ public class TestIPC {
    * Check that file descriptors aren't leaked by starting
    * and stopping IPC servers.
    */
+  @Test
   public void testSocketLeak() throws Exception {
     Assume.assumeTrue(FD_DIR.exists()); // only run on Linux