From ba253473da5e8c9622504c353ea5de08aac2fa41 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Tue, 25 Nov 2014 09:39:04 +0000 Subject: [PATCH] Reenable GetStats test. Also increasing start bitrate to have the test go significantly faster on average. Hopefully an assert hit in the jitter buffer while running this test was fixed in r7735. R=stefan@webrtc.org BUG=4014 Review URL: https://webrtc-codereview.appspot.com/26239004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7744 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video/end_to_end_tests.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc index 86b8009c49..769d3b16af 100644 --- a/webrtc/video/end_to_end_tests.cc +++ b/webrtc/video/end_to_end_tests.cc @@ -1428,9 +1428,8 @@ void EndToEndTest::TestSendsSetSsrcs(size_t num_ssrcs, RunBaseTest(&test); } -// TODO(pbos): Reenable test, it exposes an assert in the jitter buffer. -// https://code.google.com/p/webrtc/issues/detail?id=4014 -TEST_F(EndToEndTest, DISABLED_GetStats) { +TEST_F(EndToEndTest, GetStats) { + static const int kStartBitrateBps = 3000000; class StatsObserver : public test::EndToEndTest, public I420FrameCallback { public: StatsObserver() @@ -1565,6 +1564,12 @@ TEST_F(EndToEndTest, DISABLED_GetStats) { return true; } + Call::Config GetSenderCallConfig() OVERRIDE { + Call::Config config = EndToEndTest::GetSenderCallConfig(); + config.stream_start_bitrate_bps = kStartBitrateBps; + return config; + } + virtual void ModifyConfigs( VideoSendStream::Config* send_config, std::vector* receive_configs,