commit 5629a1dba2af17d16978c2d70eaf15993da975ab
author solenberg <solenberg@webrtc.org> Thu Oct 01 08:45:57 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Oct 01 15:46:05 2015 +0000
tree ca675a93d5a8b3a677eaee24c7724f3e7e443aae
parent cf18b34cf3bbb1cc2984f8ae3a1c5cebf92b7007

Fix flaky test TestSrtpError, introduced in https://codereview.webrtc.org/1362913004.

BUG=webrtc:4690

Review URL: https://codereview.webrtc.org/1380103002

Cr-Commit-Position: refs/heads/master@{#10137}

talk/session/media/channel_unittest.cc

diff --git a/talk/session/media/channel_unittest.cc b/talk/session/media/channel_unittest.cc
index 7f76e16..d6f2592 100644
--- a/talk/session/media/channel_unittest.cc
+++ b/talk/session/media/channel_unittest.cc
@@ -1702,7 +1702,7 @@
     EXPECT_TRUE(SendAccept());
     EXPECT_TRUE(channel1_->secure());
     EXPECT_TRUE(channel2_->secure());
-
+    channel2_->srtp_filter()->set_signal_silent_time(250);
     channel2_->srtp_filter()->SignalSrtpError.connect(
         &error_handler, &SrtpErrorHandler::OnSrtpError);
 
@@ -1712,18 +1712,22 @@
     EXPECT_EQ_WAIT(cricket::SrtpFilter::ERROR_FAIL, error_handler.error_, 500);
     EXPECT_EQ(cricket::SrtpFilter::PROTECT, error_handler.mode_);
     error_handler.error_ = cricket::SrtpFilter::ERROR_NONE;
-    // The next 1 sec failures will not trigger an error.
+    error_handler.mode_ = cricket::SrtpFilter::UNPROTECT;
+    // The next 250 ms failures will not trigger an error.
     EXPECT_FALSE(media_channel2_->SendRtp(kBadPacket, sizeof(kBadPacket)));
     // Wait for a while to ensure no message comes in.
-    rtc::Thread::Current()->ProcessMessages(210);
+    rtc::Thread::Current()->ProcessMessages(200);
     EXPECT_EQ(cricket::SrtpFilter::ERROR_NONE, error_handler.error_);
-    // The error will be triggered again.
+    EXPECT_EQ(cricket::SrtpFilter::UNPROTECT, error_handler.mode_);
+    // Wait for a little more - the error will be triggered again.
+    rtc::Thread::Current()->ProcessMessages(200);
     EXPECT_FALSE(media_channel2_->SendRtp(kBadPacket, sizeof(kBadPacket)));
     EXPECT_EQ_WAIT(cricket::SrtpFilter::ERROR_FAIL, error_handler.error_, 500);
     EXPECT_EQ(cricket::SrtpFilter::PROTECT, error_handler.mode_);
 
     // Testing failures in receiving packets.
     error_handler.error_ = cricket::SrtpFilter::ERROR_NONE;
+    error_handler.mode_ = cricket::SrtpFilter::UNPROTECT;
 
     cricket::TransportChannel* transport_channel =
         channel2_->transport_channel();