svn commit: r949330 - in /hadoop/common/trunk: CHANGES.txt src/test/core/org/apache/hadoop/net/TestNetUtils.java

[jghoman]

Author: jghoman
Date: Sat May 29 00:49:54 2010
New Revision: 949330

URL: http://svn.apache.org/viewvc?rev=949330&view=rev
Log:
HADOOP-6747. TestNetUtils fails on Mac OS X (Todd Lipcon via jghoman)

Modified:
    hadoop/common/trunk/CHANGES.txt
    hadoop/common/trunk/src/test/core/org/apache/hadoop/net/TestNetUtils.java

Modified: hadoop/common/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=949330&r1=949329&r2=949330&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Sat May 29 00:49:54 2010
@@ -52,6 +52,8 @@ Trunk (unreleased changes)
     HADOOP-6669. Respect compression configuration when creating DefaultCodec
     instances. (Koji Noguchi via cdouglas)
 
+    HADOOP-6747. TestNetUtils fails on Mac OS X. (Todd Lipcon via jghoman)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/src/test/core/org/apache/hadoop/net/TestNetUtils.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/core/org/apache/hadoop/net/TestNetUtils.java?rev=949330&r1=949329&r2=949330&view=diff
==============================================================================
--- hadoop/common/trunk/src/test/core/org/apache/hadoop/net/TestNetUtils.java 
(original)
+++ hadoop/common/trunk/src/test/core/org/apache/hadoop/net/TestNetUtils.java 
Sat May 29 00:49:54 2010
@@ -22,6 +22,7 @@ import static org.junit.Assert.*;
 
 import java.net.Socket;
 import java.net.ConnectException;
+import java.net.SocketException;
 import java.net.InetSocketAddress;
 import org.apache.hadoop.conf.Configuration;
 
@@ -51,6 +52,10 @@ public class TestNetUtils {
     } catch (ConnectException ce) {
       System.err.println("Got exception: " + ce);
       assertTrue(ce.getMessage().contains("resulted in a loopback"));
+    } catch (SocketException se) {
+      // Some TCP stacks will actually throw their own Invalid argument 
exception
+      // here. This is also OK.
+      assertTrue(se.getMessage().contains("Invalid argument"));
     }
   }
 }