admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Disable P2PTestConductor.LocalP2PTestDtlsBundleInIceRestart under msan (patchset #1 id:1 of https://codereview.webrtc.org/2546913003/ )

Browse Source 
Reason for revert:
Should be fixed (for good this time) by https://codereview.webrtc.org/2544003004/

Original issue's description:
> Disable P2PTestConductor.LocalP2PTestDtlsBundleInIceRestart under msan
>
> The test is flaky.
>
> BUG=webrtc:6811
> TBR=deadbeef@webrtc.org
>
> Committed: https://crrev.com/a28a1b9db6b8b44b3687c45fddf834e81b921b20
> Cr-Commit-Position: refs/heads/master@{#15382}

TBR=henrik.lundin@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6811

Review-Url: https://codereview.webrtc.org/2546183003
Cr-Commit-Position: refs/heads/master@{#15399}
This commit is contained in:
deadbeef 2016-12-02 18:08:57 -08:00 committed by Commit bot
parent a59b012c33
commit 4c6696c912
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/api/peerconnection_unittest.cc
View File

@ -1725,16 +1725,7 @@ 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.
#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) {
TEST_F(P2PTestConductor, LocalP2PTestDtlsBundleInIceRestart) {
MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp);
FakeConstraints setup_constraints;
setup_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp,