Re-enabling socket tests that were previously flaky.

webrtc/base/physicalsocketserver_unittest.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <memory>
 #include <signal.h>
 #include <stdarg.h>
 
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/physicalsocketserver.h"
 #include "webrtc/base/socket_unittest.h"
 #include "webrtc/base/testutils.h"
 #include "webrtc/base/thread.h"
 
 namespace rtc {
 
+#define MAYBE_SKIP_IPV6                    \
+  if (!HasIPv6Enabled()) {                 \
+    LOG(LS_INFO) << "No IPv6... skipping"; \
+    return;                                \
+  }
+
 class PhysicalSocketTest;
 
 class FakeSocketDispatcher : public SocketDispatcher {
  public:
   explicit FakeSocketDispatcher(PhysicalSocketServer* ss)
     : SocketDispatcher(ss) {
   }
 
   FakeSocketDispatcher(SOCKET s, PhysicalSocketServer* ss)
     : SocketDispatcher(s, ss) {
@@ skipping 104 matching lines @@
   }
 
   return SocketDispatcher::DoSendTo(socket, buf, len, flags, dest_addr,
       addrlen);
 }
 
 TEST_F(PhysicalSocketTest, TestConnectIPv4) {
   SocketTest::TestConnectIPv4();
 }
 
-// Crashes on Linux. See webrtc:4923.
-#if defined(WEBRTC_LINUX)
-#define MAYBE_TestConnectIPv6 DISABLED_TestConnectIPv6
-#else
-#define MAYBE_TestConnectIPv6 TestConnectIPv6
-#endif
-TEST_F(PhysicalSocketTest, MAYBE_TestConnectIPv6) {
+TEST_F(PhysicalSocketTest, TestConnectIPv6) {
   SocketTest::TestConnectIPv6();
 }
 
 TEST_F(PhysicalSocketTest, TestConnectWithDnsLookupIPv4) {
   SocketTest::TestConnectWithDnsLookupIPv4();
 }
 
 TEST_F(PhysicalSocketTest, TestConnectWithDnsLookupIPv6) {
   SocketTest::TestConnectWithDnsLookupIPv6();
 }
@@ skipping 71 matching lines @@
   std::unique_ptr<AsyncSocket> accepted2(server->Accept(&accept_addr));
   ASSERT_TRUE(accepted2);
   EXPECT_FALSE(accept_addr.IsNil());
   EXPECT_EQ(accepted2->GetRemoteAddress(), accept_addr);
 }
 
 TEST_F(PhysicalSocketTest, TestConnectAcceptErrorIPv4) {
   ConnectInternalAcceptError(kIPv4Loopback);
 }
 
-// Crashes on Linux. See webrtc:4923.
-#if defined(WEBRTC_LINUX)
-#define MAYBE_TestConnectAcceptErrorIPv6 DISABLED_TestConnectAcceptErrorIPv6
-#else
-#define MAYBE_TestConnectAcceptErrorIPv6 TestConnectAcceptErrorIPv6
-#endif
-TEST_F(PhysicalSocketTest, MAYBE_TestConnectAcceptErrorIPv6) {
+TEST_F(PhysicalSocketTest, TestConnectAcceptErrorIPv6) {
+  MAYBE_SKIP_IPV6;
   ConnectInternalAcceptError(kIPv6Loopback);
 }
 
 void PhysicalSocketTest::WritableAfterPartialWrite(const IPAddress& loopback) {
   // Simulate a really small maximum send size.
   const int kMaxSendSize = 128;
   SetMaxSendSize(kMaxSendSize);
 
   // Run the default send/receive socket tests with a smaller amount of data
   // to avoid long running times due to the small maximum send size.
   const size_t kDataSize = 128 * 1024;
   TcpInternal(loopback, kDataSize, kMaxSendSize);
 }
 
 TEST_F(PhysicalSocketTest, TestWritableAfterPartialWriteIPv4) {
   WritableAfterPartialWrite(kIPv4Loopback);
 }
 
-// Crashes on Linux. See webrtc:4923.
-#if defined(WEBRTC_LINUX)
-#define MAYBE_TestWritableAfterPartialWriteIPv6 \
-    DISABLED_TestWritableAfterPartialWriteIPv6
-#else
-#define MAYBE_TestWritableAfterPartialWriteIPv6 \
-    TestWritableAfterPartialWriteIPv6
-#endif
-TEST_F(PhysicalSocketTest, MAYBE_TestWritableAfterPartialWriteIPv6) {
+TEST_F(PhysicalSocketTest, TestWritableAfterPartialWriteIPv6) {
+  MAYBE_SKIP_IPV6;
   WritableAfterPartialWrite(kIPv6Loopback);
 }
 
-// Crashes on Linux. See webrtc:4923.
-#if defined(WEBRTC_LINUX)
-#define MAYBE_TestConnectFailIPv6 DISABLED_TestConnectFailIPv6
-#else
-#define MAYBE_TestConnectFailIPv6 TestConnectFailIPv6
-#endif
-TEST_F(PhysicalSocketTest, MAYBE_TestConnectFailIPv6) {
+TEST_F(PhysicalSocketTest, TestConnectFailIPv6) {
   SocketTest::TestConnectFailIPv6();
 }
 
 TEST_F(PhysicalSocketTest, TestConnectWithDnsLookupFailIPv4) {
   SocketTest::TestConnectWithDnsLookupFailIPv4();
 }
 
-// Crashes on Linux. See webrtc:4923.
-#if defined(WEBRTC_LINUX)
-#define MAYBE_TestConnectWithDnsLookupFailIPv6 \
-  DISABLED_TestConnectWithDnsLookupFailIPv6
-#else
-#define MAYBE_TestConnectWithDnsLookupFailIPv6 \
-  TestConnectWithDnsLookupFailIPv6
-#endif
-TEST_F(PhysicalSocketTest, MAYBE_TestConnectWithDnsLookupFailIPv6) {
+TEST_F(PhysicalSocketTest, TestConnectWithDnsLookupFailIPv6) {
   SocketTest::TestConnectWithDnsLookupFailIPv6();
 }
 
 
 TEST_F(PhysicalSocketTest, TestConnectWithClosedSocketIPv4) {
   SocketTest::TestConnectWithClosedSocketIPv4();
 }
 
-// Crashes on Linux. See webrtc:4923.
-#if defined(WEBRTC_LINUX)
-#define MAYBE_TestConnectWithClosedSocketIPv6 \
-  DISABLED_TestConnectWithClosedSocketIPv6
-#else
-#define MAYBE_TestConnectWithClosedSocketIPv6 TestConnectWithClosedSocketIPv6
-#endif
-TEST_F(PhysicalSocketTest, MAYBE_TestConnectWithClosedSocketIPv6) {
+TEST_F(PhysicalSocketTest, TestConnectWithClosedSocketIPv6) {
   SocketTest::TestConnectWithClosedSocketIPv6();
 }
 
 TEST_F(PhysicalSocketTest, TestConnectWhileNotClosedIPv4) {
   SocketTest::TestConnectWhileNotClosedIPv4();
 }
 
-// Crashes on Linux. See webrtc:4923.
-#if defined(WEBRTC_LINUX)
-#define MAYBE_TestConnectWhileNotClosedIPv6 \
-  DISABLED_TestConnectWhileNotClosedIPv6
-#else
-#define MAYBE_TestConnectWhileNotClosedIPv6 TestConnectWhileNotClosedIPv6
-#endif
-TEST_F(PhysicalSocketTest, MAYBE_TestConnectWhileNotClosedIPv6) {
+TEST_F(PhysicalSocketTest, TestConnectWhileNotClosedIPv6) {
   SocketTest::TestConnectWhileNotClosedIPv6();
 }
 
 TEST_F(PhysicalSocketTest, TestServerCloseDuringConnectIPv4) {
   SocketTest::TestServerCloseDuringConnectIPv4();
 }
 
-// Crashes on Linux. See webrtc:4923.
-#if defined(WEBRTC_LINUX)
-#define MAYBE_TestServerCloseDuringConnectIPv6 \
-  DISABLED_TestServerCloseDuringConnectIPv6
-#else
-#define MAYBE_TestServerCloseDuringConnectIPv6 TestServerCloseDuringConnectIPv6
-#endif
-TEST_F(PhysicalSocketTest, MAYBE_TestServerCloseDuringConnectIPv6) {
+TEST_F(PhysicalSocketTest, TestServerCloseDuringConnectIPv6) {
   SocketTest::TestServerCloseDuringConnectIPv6();
 }
 
 TEST_F(PhysicalSocketTest, TestClientCloseDuringConnectIPv4) {
   SocketTest::TestClientCloseDuringConnectIPv4();
 }
 
-// Crashes on Linux. See webrtc:4923.
-#if defined(WEBRTC_LINUX)
-#define MAYBE_TestClientCloseDuringConnectIPv6 \
-  DISABLED_TestClientCloseDuringConnectIPv6
-#else
-#define MAYBE_TestClientCloseDuringConnectIPv6 TestClientCloseDuringConnectIPv6
-#endif
-TEST_F(PhysicalSocketTest, MAYBE_TestClientCloseDuringConnectIPv6) {
+TEST_F(PhysicalSocketTest, TestClientCloseDuringConnectIPv6) {
   SocketTest::TestClientCloseDuringConnectIPv6();
 }
 
 TEST_F(PhysicalSocketTest, TestServerCloseIPv4) {
   SocketTest::TestServerCloseIPv4();
 }
 
-// Crashes on Linux. See webrtc:4923.
-#if defined(WEBRTC_LINUX)
-#define MAYBE_TestServerCloseIPv6 DISABLED_TestServerCloseIPv6
-#else
-#define MAYBE_TestServerCloseIPv6 TestServerCloseIPv6
-#endif
-TEST_F(PhysicalSocketTest, MAYBE_TestServerCloseIPv6) {
+TEST_F(PhysicalSocketTest, TestServerCloseIPv6) {
   SocketTest::TestServerCloseIPv6();
 }
 
 TEST_F(PhysicalSocketTest, TestCloseInClosedCallbackIPv4) {
   SocketTest::TestCloseInClosedCallbackIPv4();
 }
 
-// Crashes on Linux. See webrtc:4923.
-#if defined(WEBRTC_LINUX)
-#define MAYBE_TestCloseInClosedCallbackIPv6 \
-  DISABLED_TestCloseInClosedCallbackIPv6
-#else
-#define MAYBE_TestCloseInClosedCallbackIPv6 TestCloseInClosedCallbackIPv6
-#endif
-TEST_F(PhysicalSocketTest, MAYBE_TestCloseInClosedCallbackIPv6) {
+TEST_F(PhysicalSocketTest, TestCloseInClosedCallbackIPv6) {
   SocketTest::TestCloseInClosedCallbackIPv6();
 }
 
 TEST_F(PhysicalSocketTest, TestSocketServerWaitIPv4) {
   SocketTest::TestSocketServerWaitIPv4();
 }
 
-// Crashes on Linux. See webrtc:4923.
-#if defined(WEBRTC_LINUX)
-#define MAYBE_TestSocketServerWaitIPv6 DISABLED_TestSocketServerWaitIPv6
-#else
-#define MAYBE_TestSocketServerWaitIPv6 TestSocketServerWaitIPv6
-#endif
-TEST_F(PhysicalSocketTest, MAYBE_TestSocketServerWaitIPv6) {
+TEST_F(PhysicalSocketTest, TestSocketServerWaitIPv6) {
   SocketTest::TestSocketServerWaitIPv6();
 }
 
 TEST_F(PhysicalSocketTest, TestTcpIPv4) {
   SocketTest::TestTcpIPv4();
 }
 
-// Crashes on Linux. See webrtc:4923.
-#if defined(WEBRTC_LINUX)
-#define MAYBE_TestTcpIPv6 DISABLED_TestTcpIPv6
-#else
-#define MAYBE_TestTcpIPv6 TestTcpIPv6
-#endif
-TEST_F(PhysicalSocketTest, MAYBE_TestTcpIPv6) {
+TEST_F(PhysicalSocketTest, TestTcpIPv6) {
   SocketTest::TestTcpIPv6();
 }
 
 TEST_F(PhysicalSocketTest, TestUdpIPv4) {
   SocketTest::TestUdpIPv4();
 }
 
-// Crashes on Linux. See webrtc:4923.
-#if defined(WEBRTC_LINUX)
-#define MAYBE_TestUdpIPv6 DISABLED_TestUdpIPv6
-#else
-#define MAYBE_TestUdpIPv6 TestUdpIPv6
-#endif
-TEST_F(PhysicalSocketTest, MAYBE_TestUdpIPv6) {
+TEST_F(PhysicalSocketTest, TestUdpIPv6) {
   SocketTest::TestUdpIPv6();
 }
 
 // Disable for TSan v2, see
 // https://code.google.com/p/webrtc/issues/detail?id=3498 for details.
 // Also disable for MSan, see:
 // https://code.google.com/p/webrtc/issues/detail?id=4958
 // TODO(deadbeef): Enable again once test is reimplemented to be unflaky.
 // Also disable for ASan.
 // Disabled on Android: https://code.google.com/p/webrtc/issues/detail?id=4364
@@ skipping 140 matching lines @@
   thread->Start(runnable.get());
   EXPECT_TRUE(ss_->Wait(1500, true));
   EXPECT_TRUE(ExpectSignal(SIGTERM));
   EXPECT_EQ(Thread::Current(), signaled_thread_);
   EXPECT_TRUE(ExpectNone());
 }
 
 #endif
 
 }  // namespace rtc