generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes a flake in network down tests.

Browse Source 
And reduces the flakiness in NACK tests.

TESTS=trybots
R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2258004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4788 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org 2013-09-19 11:14:35 +00:00
parent d8a9b86671
commit b5a191bfe7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
View File

@ -385,7 +385,7 @@ void ViEAutoTest::ViERtpRtcpStandardTest()
EXPECT_EQ(0, ViE.rtp_rtcp->SetNACKStatus(tbChannel.videoChannel, true)); EXPECT_EQ(0, ViE.rtp_rtcp->SetNACKStatus(tbChannel.videoChannel, true));
EXPECT_EQ(0, ViE.base->StartSend(tbChannel.videoChannel)); EXPECT_EQ(0, ViE.base->StartSend(tbChannel.videoChannel));
AutoTestSleep(kAutoTestSleepTimeMs); AutoTestSleep(4 * kAutoTestSleepTimeMs);
EXPECT_EQ(0, ViE.rtp_rtcp->GetBandwidthUsage( EXPECT_EQ(0, ViE.rtp_rtcp->GetBandwidthUsage(
tbChannel.videoChannel, sentTotalBitrate, sentVideoBitrate, tbChannel.videoChannel, sentTotalBitrate, sentVideoBitrate,
@ -509,9 +509,9 @@ void ViEAutoTest::ViERtpRtcpStandardTest()
if (FLAGS_include_timing_dependent_tests) { if (FLAGS_include_timing_dependent_tests) {
EXPECT_GT(bytes_received_after, bytes_received_before); EXPECT_GT(bytes_received_after, bytes_received_before);
} }
bytes_received_before = bytes_received_after;
// Simulate lost reception and verify that nothing is sent during that time. // Simulate lost reception and verify that nothing is sent during that time.
ViE.network->SetNetworkTransmissionState(tbChannel.videoChannel, false); ViE.network->SetNetworkTransmissionState(tbChannel.videoChannel, false);
bytes_received_before = bytes_received_after;
ViETest::Log("Network Down...\n"); ViETest::Log("Network Down...\n");
AutoTestSleep(kAutoTestSleepTimeMs); AutoTestSleep(kAutoTestSleepTimeMs);
EXPECT_EQ(0, ViE.rtp_rtcp->GetRTPStatistics(tbChannel.videoChannel, EXPECT_EQ(0, ViE.rtp_rtcp->GetRTPStatistics(tbChannel.videoChannel,