From 62ecc20afb518d55b825aa0b08eb2cfae635e48f Mon Sep 17 00:00:00 2001 From: "marpan@webrtc.org" Date: Tue, 13 Aug 2013 21:36:48 +0000 Subject: [PATCH] Revert r4539 "Disable racy part of RunsRtpRtcpTestWithoutErrors". 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 --- .../test/auto_test/source/vie_autotest_rtp_rtcp.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc index 946eb320ca..dbd3ac6d40 100644 --- a/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc +++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc @@ -269,16 +269,14 @@ void ViEAutoTest::ViERtpRtcpStandardTest() EXPECT_GT(sentTotalBitrate, 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 // + // Stop and restart to clear stats 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(); 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. EXPECT_GE(recExtendedMax, sentExtendedMax); EXPECT_EQ(0, ViE.base->StopSend(tbChannel.videoChannel)); -#endif // ENABLED_RACY_STATISTICS_TEST // // Test bandwidth statistics with NACK and FEC separately