Fixed UDP tests for MacOS X 10.7

net/udp/udp_socket_unittest.cc

Index: net/udp/udp_socket_unittest.cc
diff --git a/net/udp/udp_socket_unittest.cc b/net/udp/udp_socket_unittest.cc
index 2da866df97189af9455ebcfb8734b422c7bef0c7..1ae3c22e0d90fe72dc17206d9fd50c2209cca9ab 100644
--- a/net/udp/udp_socket_unittest.cc
+++ b/net/udp/udp_socket_unittest.cc
@@ -5,6 +5,10 @@
 #include "net/udp/udp_client_socket.h"
 #include "net/udp/udp_server_socket.h"
 
+#if defined(OS_MACOSX)
+#include <unistd.h>
+#endif  // defined(OS_MACOSX)
+
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
@@ -131,10 +135,11 @@ TEST_F(UDPSocketTest, Connect) {
 
   // Setup the server to listen.
   IPEndPoint bind_address;
-  CreateUDPAddress("0.0.0.0", kPort, &bind_address);
+  CreateUDPAddress("127.0.0.1", kPort, &bind_address);
   CapturingNetLog server_log;
   scoped_ptr<UDPServerSocket> server(
       new UDPServerSocket(&server_log, NetLog::Source()));
+  server->AllowAddressReuse();
   int rv = server->Listen(bind_address);
   EXPECT_EQ(OK, rv);
 
@@ -202,6 +207,13 @@ TEST_F(UDPSocketTest, Connect) {
 }
 
 TEST_F(UDPSocketTest, Broadcast) {
+#if defined(OS_MACOSX)

[viettrungluu, 2012/09/10 17:51:10]

Do you really expect that we'll ever run this test as root?

If not, maybe we should just disable this test (via conditionally marking it as
"DISABLED_Broadcast") on Mac?

[mmenke, 2012/09/10 17:53:29]

I agree that this is better practice.

[ygorshenin1, 2012/09/10 18:07:05]

Done.

+  if (getuid() != 0) {
+    LOG(ERROR) <<
+        "Skipping test as UDP Broadcast requires root permissions on OSX 10.7+";
+    return;
+  }
+#endif  // defined(OS_MACOSX)
   const int kPort = 9999;
   std::string first_message("first message"), second_message("second message");
 
@@ -335,14 +347,16 @@ TEST_F(UDPSocketTest, VerifyConnectBindsAddr) {
 
   // Setup the first server to listen.
   IPEndPoint bind_address;
-  CreateUDPAddress("0.0.0.0", kPort1, &bind_address);
+  CreateUDPAddress("127.0.0.1", kPort1, &bind_address);
   UDPServerSocket server1(NULL, NetLog::Source());
+  server1.AllowAddressReuse();
   int rv = server1.Listen(bind_address);
   EXPECT_EQ(OK, rv);
 
   // Setup the second server to listen.
-  CreateUDPAddress("0.0.0.0", kPort2, &bind_address);
+  CreateUDPAddress("127.0.0.1", kPort2, &bind_address);
   UDPServerSocket server2(NULL, NetLog::Source());
+  server2.AllowAddressReuse();
   rv = server2.Listen(bind_address);
   EXPECT_EQ(OK, rv);