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

Revert of Disabled flaky P2PTestConductor tests on ASAN and MSAN. (patchset #1 id:1 of https://codereview.webrtc.org/2539103002/ )

Browse Source 
Reason for revert:
The flaky tests should now be fixed.

Original issue's description:
> Disabled flaky P2PTestConductor tests on ASAN and MSAN.
>
> TBR=deadbeef@webrtc.org
> BUG=webrtc:6776
>
> Committed: https://crrev.com/8d66a5a3b18eef73b238f4220477da265bf4494b
> Cr-Commit-Position: refs/heads/master@{#15324}

TBR=ossu@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:6776

Review-Url: https://codereview.webrtc.org/2550453003
Cr-Commit-Position: refs/heads/master@{#15371}
This commit is contained in:
deadbeef 2016-12-01 12:54:20 -08:00 committed by Commit bot
parent c6b6e09d18
commit 8f89bff9a6
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
webrtc/api/peerconnection_unittest.cc
View File

@ -2046,15 +2046,9 @@ TEST_F(P2PTestConductor, GetGcmRecv) {
TestGcmNegotiation(false, true, kDefaultSrtpCryptoSuite);
}
// Disabled due to flakiness, see http://crbug.com/webrtc/6776
#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER)
#define MAYBE_LocalP2PTestRtpDataChannel DISABLED_LocalP2PTestRtpDataChannel
#else
#define MAYBE_LocalP2PTestRtpDataChannel LocalP2PTestRtpDataChannel
#endif
// This test sets up a call between two parties with audio, video and an RTP
// data channel.
TEST_F(P2PTestConductor, MAYBE_LocalP2PTestRtpDataChannel) {
TEST_F(P2PTestConductor, LocalP2PTestRtpDataChannel) {
FakeConstraints setup_constraints;
setup_constraints.SetAllowRtpDataChannels();
ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints));
@ -2207,15 +2201,9 @@ TEST_F(P2PTestConductor, RegisterDataChannelObserver) {
EXPECT_EQ_WAIT(data, new_observer.last_message(), kMaxWaitMs);
}
// Disabled due to flakiness, see http://crbug.com/webrtc/6776
#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER)
#define MAYBE_LocalP2PTestReceiverDoesntSupportData DISABLED_LocalP2PTestReceiverDoesntSupportData
#else
#define MAYBE_LocalP2PTestReceiverDoesntSupportData LocalP2PTestReceiverDoesntSupportData
#endif
// This test sets up a call between two parties with audio, video and but only
// the initiating client support data.
TEST_F(P2PTestConductor, MAYBE_LocalP2PTestReceiverDoesntSupportData) {
TEST_F(P2PTestConductor, LocalP2PTestReceiverDoesntSupportData) {
FakeConstraints setup_constraints_1;
setup_constraints_1.SetAllowRtpDataChannels();
// Must disable DTLS to make negotiation succeed.
@ -2232,15 +2220,9 @@ TEST_F(P2PTestConductor, MAYBE_LocalP2PTestReceiverDoesntSupportData) {
EXPECT_FALSE(initializing_client()->data_observer()->IsOpen());
}
// Disabled due to flakiness, see http://crbug.com/webrtc/6776
#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER)
#define MAYBE_AddDataChannelAfterRenegotiation DISABLED_AddDataChannelAfterRenegotiation
#else
#define MAYBE_AddDataChannelAfterRenegotiation AddDataChannelAfterRenegotiation
#endif
// This test sets up a call between two parties with audio, video. When audio
// and video is setup and flowing and data channel is negotiated.
TEST_F(P2PTestConductor, MAYBE_AddDataChannelAfterRenegotiation) {
TEST_F(P2PTestConductor, AddDataChannelAfterRenegotiation) {
FakeConstraints setup_constraints;
setup_constraints.SetAllowRtpDataChannels();
ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints));