HADOOP-6747. TestNetUtils fails on Mac OS X (Todd Lipcon via jghoman)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@949330 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -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

src/test/core/org/apache/hadoop/net/TestNetUtils.java

@@ -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"));
     }
   }
 }