From a05653b2c11b5f0cfbbef326f90c916c2b8598f1 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Tue, 13 Aug 2013 14:27:20 +0000 Subject: [PATCH] Disable racy part of RunsRtpRtcpTestWithoutErrors. Disabled part as suggested in bug 1790, but without breaking it up into multiple tests. These tests will be made redundant by tests for the new API, and it would take far too long to clean these up properly. BUG=1790 R=kjellander@webrtc.org, mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2022004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4539 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../test/auto_test/source/vie_autotest_rtp_rtcp.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 dbd3ac6d40..946eb320ca 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,15 +269,17 @@ void ViEAutoTest::ViERtpRtcpStandardTest() EXPECT_GT(sentTotalBitrate, 0u); EXPECT_GT(sentNackBitrate, 0u); - // - // 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)); +#ifdef ENABLED_RACY_STATISTICS_TEST + // + // Statistics + // + ViETest::Log("Testing statistics\n"); + myTransport.ClearStats(); network.packet_loss_rate = kPacketLossRate; network.loss_model = kUniformLoss; @@ -353,6 +355,7 @@ 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