aboutsummaryrefslogtreecommitdiff
path: root/talk/media/webrtc/webrtcvideoengine_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'talk/media/webrtc/webrtcvideoengine_unittest.cc')
-rw-r--r--talk/media/webrtc/webrtcvideoengine_unittest.cc10
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();
}