diff options
| author | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-10 09:39:06 +0000 |
|---|---|---|
| committer | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-10 09:39:06 +0000 |
| commit | 3eb2c2f4c35ab62ede70d34699eecc17956b0fcf (patch) | |
| tree | 1d8a8ee5d42f8eb0e56a7f3a8fa4adb75950a69e /talk/media/webrtc/webrtcvideoengine_unittest.cc | |
| parent | 86f613d6b893d03c822373f7e7ec51db78a90f9f (diff) | |
| download | webrtc-3eb2c2f4c35ab62ede70d34699eecc17956b0fcf.tar.gz | |
(Auto)update libjingle 68891947-> 68893961
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6383 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'talk/media/webrtc/webrtcvideoengine_unittest.cc')
| -rw-r--r-- | talk/media/webrtc/webrtcvideoengine_unittest.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/talk/media/webrtc/webrtcvideoengine_unittest.cc b/talk/media/webrtc/webrtcvideoengine_unittest.cc index da8e62d565..da0c9321f2 100644 --- a/talk/media/webrtc/webrtcvideoengine_unittest.cc +++ b/talk/media/webrtc/webrtcvideoengine_unittest.cc @@ -2323,13 +2323,19 @@ TEST_F(WebRtcVideoMediaChannelTest, DISABLED_SendVp8HdAndReceiveAdaptedVp8Vga) { EXPECT_FRAME_WAIT(1, codec.width, codec.height, kTimeout); } -// TODO(juberti): Fix this test to tolerate missing stats. +#ifdef USE_WEBRTC_DEV_BRANCH +TEST_F(WebRtcVideoMediaChannelTest, GetStats) { +#else TEST_F(WebRtcVideoMediaChannelTest, DISABLED_GetStats) { +#endif Base::GetStats(); } -// TODO(juberti): Fix this test to tolerate missing stats. +#ifdef USE_WEBRTC_DEV_BRANCH +TEST_F(WebRtcVideoMediaChannelTest, GetStatsMultipleRecvStreams) { +#else TEST_F(WebRtcVideoMediaChannelTest, DISABLED_GetStatsMultipleRecvStreams) { +#endif Base::GetStatsMultipleRecvStreams(); } |