From a28a1b9db6b8b44b3687c45fddf834e81b921b20 Mon Sep 17 00:00:00 2001 From: "henrik.lundin" Date: Fri, 2 Dec 2016 02:59:32 -0800 Subject: [PATCH] Disable P2PTestConductor.LocalP2PTestDtlsBundleInIceRestart under msan The test is flaky. BUG=webrtc:6811 TBR=deadbeef@webrtc.org Review-Url: https://codereview.webrtc.org/2546913003 Cr-Commit-Position: refs/heads/master@{#15382} --- webrtc/api/peerconnection_unittest.cc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/webrtc/api/peerconnection_unittest.cc b/webrtc/api/peerconnection_unittest.cc index 0ae1004881..4cb6190c91 100644 --- a/webrtc/api/peerconnection_unittest.cc +++ b/webrtc/api/peerconnection_unittest.cc @@ -1721,7 +1721,16 @@ TEST_F(P2PTestConductor, LocalP2PTestDtlsTransferCallee) { // This test sets up a non-bundle call and apply bundle during ICE restart. When // bundle is in effect in the restart, the channel can successfully reset its // DTLS-SRTP context. -TEST_F(P2PTestConductor, LocalP2PTestDtlsBundleInIceRestart) { +#if defined(MEMORY_SANITIZER) +// Fails under MemorySanitizer: +// See https://bugs.chromium.org/p/webrtc/issues/detail?id=6811 +#define MAYBE_LocalP2PTestDtlsBundleInIceRestart \ + DISABLED_LocalP2PTestDtlsBundleInIceRestart +#else +#define MAYBE_LocalP2PTestDtlsBundleInIceRestart \ + LocalP2PTestDtlsBundleInIceRestart +#endif +TEST_F(P2PTestConductor, MAYBE_LocalP2PTestDtlsBundleInIceRestart) { MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp); FakeConstraints setup_constraints; setup_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp,