From 8ed5d3421492a3a9def32398b174937b9109f797 Mon Sep 17 00:00:00 2001 From: Todd Lipcon Date: Thu, 2 Jun 2011 19:23:43 +0000 Subject: [PATCH] HADOOP-7349. HADOOP-7121 accidentally disabled some tests in TestIPC. Contributed by Todd Lipcon. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1130758 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 3 +++ src/test/core/org/apache/hadoop/ipc/TestIPC.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 33497d80da..f7a0470e24 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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 diff --git a/src/test/core/org/apache/hadoop/ipc/TestIPC.java b/src/test/core/org/apache/hadoop/ipc/TestIPC.java index 83d9d1b5f7..71c64114e3 100644 --- a/src/test/core/org/apache/hadoop/ipc/TestIPC.java +++ b/src/test/core/org/apache/hadoop/ipc/TestIPC.java @@ -445,6 +445,7 @@ private static void assertExceptionContains( * 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 void testSocketFactoryException() throws Exception { } } + @Test public void testIpcTimeout() throws Exception { // start server Server server = new TestServer(1, true); @@ -485,6 +487,7 @@ public void testIpcTimeout() throws Exception { * 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