From 491bd534ef726456883ec372562d1c8fef82e7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Thu, 4 Jun 2015 14:57:52 +0200 Subject: [PATCH] Disable some PortAllocatorTest on tsan due to flakiness TBR=kjellander@webrtc.org BUG=4743 Review URL: https://codereview.webrtc.org/1160033005 Cr-Commit-Position: refs/heads/master@{#9369} --- webrtc/p2p/client/portallocator_unittest.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/webrtc/p2p/client/portallocator_unittest.cc b/webrtc/p2p/client/portallocator_unittest.cc index 148623dfb3..b2d4eb26aa 100644 --- a/webrtc/p2p/client/portallocator_unittest.cc +++ b/webrtc/p2p/client/portallocator_unittest.cc @@ -472,6 +472,10 @@ TEST_F(PortAllocatorTest, TestDisableAdapterEnumerationMultipleInterfaces) { CheckDisableAdapterEnumeration(); } +// Disable for TSan v2, see +// https://code.google.com/p/webrtc/issues/detail?id=4743 for details. +#if !defined(THREAD_SANITIZER) + // Test that we can get OnCandidatesAllocationDone callback when all the ports // are disabled. TEST_F(PortAllocatorTest, TestDisableAllPorts) { @@ -509,6 +513,8 @@ TEST_F(PortAllocatorTest, TestGetAllPortsNoUdpSockets) { EXPECT_TRUE(candidate_allocation_done_); } +#endif // if !defined(THREAD_SANITIZER) + // Test that we don't crash or malfunction if we can't create UDP sockets or // listen on TCP sockets. We still give out a local TCP address, since // apparently this is needed for the remote side to accept our connection.