commit b7b9dca4e43fba58bc1ec0fedbd0f92882af4c3a
author danilchap <danilchap@webrtc.org> Fri Aug 05 12:55:43 2016
committer Commit bot <commit-bot@chromium.org> Fri Aug 05 12:55:49 2016
tree ebe20054899f1a6d89a6eff6111e298fbe8595bd
parent ac86c68e224a968b7f77241c897929d94f909999

Reland Enable socketservers unittests on windows.

Original CL: https://codereview.webrtc.org/2199193004/
Revert CL: https://codereview.webrtc.org/2209333002/

NOTRY=true
BUG=webrtc:6167,webrtc:6178

Review-Url: https://codereview.webrtc.org/2218853002
Cr-Commit-Position: refs/heads/master@{#13654}

webrtc/base/physicalsocketserver_unittest.cc

diff --git a/webrtc/base/physicalsocketserver_unittest.cc b/webrtc/base/physicalsocketserver_unittest.cc
index bd1acfb..6de8a90 100644
--- a/webrtc/base/physicalsocketserver_unittest.cc
+++ b/webrtc/base/physicalsocketserver_unittest.cc
@@ -259,11 +259,23 @@
   TcpInternal(loopback, kDataSize, kMaxSendSize);
 }
 
-TEST_F(PhysicalSocketTest, TestWritableAfterPartialWriteIPv4) {
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=6167
+#if defined(WEBRTC_WIN)
+#define MAYBE_TestWritableAfterPartialWriteIPv4 DISABLED_TestWritableAfterPartialWriteIPv4
+#else
+#define MAYBE_TestWritableAfterPartialWriteIPv4 TestWritableAfterPartialWriteIPv4
+#endif
+TEST_F(PhysicalSocketTest, MAYBE_TestWritableAfterPartialWriteIPv4) {
   WritableAfterPartialWrite(kIPv4Loopback);
 }
 
-TEST_F(PhysicalSocketTest, TestWritableAfterPartialWriteIPv6) {
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=6167
+#if defined(WEBRTC_WIN)
+#define MAYBE_TestWritableAfterPartialWriteIPv6 DISABLED_TestWritableAfterPartialWriteIPv6
+#else
+#define MAYBE_TestWritableAfterPartialWriteIPv6 TestWritableAfterPartialWriteIPv6
+#endif
+TEST_F(PhysicalSocketTest, MAYBE_TestWritableAfterPartialWriteIPv6) {
   MAYBE_SKIP_IPV6;
   WritableAfterPartialWrite(kIPv6Loopback);
 }
@@ -372,7 +384,13 @@
   SocketTest::TestUdpReadyToSendIPv4();
 }
 
-TEST_F(PhysicalSocketTest, TestUdpReadyToSendIPv6) {
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=6167
+#if defined(WEBRTC_WIN)
+#define MAYBE_TestUdpReadyToSendIPv6 DISABLED_TestUdpReadyToSendIPv6
+#else
+#define MAYBE_TestUdpReadyToSendIPv6 TestUdpReadyToSendIPv6
+#endif
+TEST_F(PhysicalSocketTest, MAYBE_TestUdpReadyToSendIPv6) {
   SocketTest::TestUdpReadyToSendIPv6();
 }