| Index: webrtc/api/peerconnection_unittest.cc
|
| diff --git a/webrtc/api/peerconnection_unittest.cc b/webrtc/api/peerconnection_unittest.cc
|
| index 0ae10048818e0a732c2c6b2000fa78b3d9bd1192..4cb6190c9135446b47db3286032884ecc546b968 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,
|
|
|