From b0e6eb50b5917e31c6114b9cd7f63ba01d57eea6 Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Tue, 24 Sep 2013 10:38:57 +0000 Subject: [PATCH] Revert r4823 "Reenable test and remove flaky expects." TBR=mflodman@webrtc.org BUG=2415 Review URL: https://webrtc-codereview.appspot.com/2277005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4824 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../test/auto_test/automated/vie_api_integration_test.cc | 4 +++- .../test/auto_test/source/vie_autotest_rtp_rtcp.cc | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/webrtc/video_engine/test/auto_test/automated/vie_api_integration_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_api_integration_test.cc index 5ba17f2682..8071baa7b6 100644 --- a/webrtc/video_engine/test/auto_test/automated/vie_api_integration_test.cc +++ b/webrtc/video_engine/test/auto_test/automated/vie_api_integration_test.cc @@ -48,7 +48,9 @@ TEST_F(DISABLED_ON_MAC(ViEApiIntegrationTest), RunsRenderTestWithoutErrors) { tests_->ViERenderAPITest(); } -TEST_F(DISABLED_ON_MAC(ViEApiIntegrationTest), RunsRtpRtcpTestWithoutErrors) { +// See: https://code.google.com/p/webrtc/issues/detail?id=2415 +TEST_F(DISABLED_ON_MAC(ViEApiIntegrationTest), + DISABLED_RunsRtpRtcpTestWithoutErrors) { tests_->ViERtpRtcpAPITest(); } 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 40578b912b..3b4753eca9 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 @@ -210,6 +210,8 @@ void ViEAutoTest::ViERtpRtcpStandardTest() EXPECT_EQ(num_dropped_packets, 0); EXPECT_GT(num_rtcp_packets, 0); EXPECT_GT(sentTotalBitrate, 0u); + EXPECT_EQ(sentNackBitrate, 0u); + EXPECT_EQ(recCumulativeLost, 0u); // // RTX