From 685be147cba2dadc64a2fc19948b2547fead040b Mon Sep 17 00:00:00 2001 From: Rasmus Brandt Date: Mon, 15 Mar 2021 14:03:38 +0100 Subject: [PATCH] Disable flaky AddMediaToConnectedBundleDoesNotRestartIce on tsan Bug: webrtc:12538 Change-Id: I223f159904ffef5c7736a23c16a031f153c6a6da Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/211868 Commit-Queue: Rasmus Brandt Reviewed-by: Harald Alvestrand Cr-Commit-Position: refs/heads/master@{#33463} --- pc/peer_connection_integrationtest.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pc/peer_connection_integrationtest.cc b/pc/peer_connection_integrationtest.cc index 86b96963f6..faf6053adb 100644 --- a/pc/peer_connection_integrationtest.cc +++ b/pc/peer_connection_integrationtest.cc @@ -2297,8 +2297,16 @@ TEST_P(PeerConnectionIntegrationTest, EndToEndCallWithIceRenomination) { // With a max bundle policy and RTCP muxing, adding a new media description to // the connection should not affect ICE at all because the new media will use // the existing connection. +// TODO(bugs.webrtc.org/12538): Fails on tsan. +#if defined(THREAD_SANITIZER) +#define MAYBE_AddMediaToConnectedBundleDoesNotRestartIce \ + DISABLED_AddMediaToConnectedBundleDoesNotRestartIce +#else +#define MAYBE_AddMediaToConnectedBundleDoesNotRestartIce \ + AddMediaToConnectedBundleDoesNotRestartIce +#endif TEST_P(PeerConnectionIntegrationTest, - AddMediaToConnectedBundleDoesNotRestartIce) { + MAYBE_AddMediaToConnectedBundleDoesNotRestartIce) { PeerConnectionInterface::RTCConfiguration config; config.bundle_policy = PeerConnectionInterface::kBundlePolicyMaxBundle; config.rtcp_mux_policy = PeerConnectionInterface::kRtcpMuxPolicyRequire;