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

Revert r4539 "Disable racy part of RunsRtpRtcpTestWithoutErrors".

Browse Source 
Bot failures for Win32-Release and Linux64-Release.

TBR=pbos@webrtc.org.

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4541 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
marpan@webrtc.org 2013-08-13 21:36:48 +00:00
parent 83ffb0dd5c
commit 62ecc20afb
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,16 +269,14 @@ void ViEAutoTest::ViERtpRtcpStandardTest()
EXPECT_GT(sentTotalBitrate, 0u); EXPECT_GT(sentTotalBitrate, 0u);
EXPECT_GT(sentNackBitrate, 0u); EXPECT_GT(sentNackBitrate, 0u);
// Stop and restart to clear stats
EXPECT_EQ(0, ViE.rtp_rtcp->SetNACKStatus(tbChannel.videoChannel, false));
EXPECT_EQ(0, ViE.base->StopReceive(tbChannel.videoChannel));
EXPECT_EQ(0, ViE.base->StopSend(tbChannel.videoChannel));
#ifdef ENABLED_RACY_STATISTICS_TEST
// //
// Statistics // Statistics
// //
// Stop and restart to clear stats
ViETest::Log("Testing statistics\n"); ViETest::Log("Testing statistics\n");
EXPECT_EQ(0, ViE.rtp_rtcp->SetNACKStatus(tbChannel.videoChannel, false));
EXPECT_EQ(0, ViE.base->StopReceive(tbChannel.videoChannel));
EXPECT_EQ(0, ViE.base->StopSend(tbChannel.videoChannel));
myTransport.ClearStats(); myTransport.ClearStats();
network.packet_loss_rate = kPacketLossRate; network.packet_loss_rate = kPacketLossRate;
@ -355,7 +353,6 @@ void ViEAutoTest::ViERtpRtcpStandardTest()
// Check that rec stats extended max is greater than what we've sent. // Check that rec stats extended max is greater than what we've sent.
EXPECT_GE(recExtendedMax, sentExtendedMax); EXPECT_GE(recExtendedMax, sentExtendedMax);
EXPECT_EQ(0, ViE.base->StopSend(tbChannel.videoChannel)); EXPECT_EQ(0, ViE.base->StopSend(tbChannel.videoChannel));
#endif // ENABLED_RACY_STATISTICS_TEST
// //
// Test bandwidth statistics with NACK and FEC separately // Test bandwidth statistics with NACK and FEC separately