admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabled some more flaky tests. Memcheck vie_auto_test should be very stable after this.

Browse Source 
BUG=1152

Review URL: https://webrtc-codereview.appspot.com/964019

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3194 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
phoglund@webrtc.org 2012-11-29 08:22:45 +00:00
parent f826bb6fb2
commit cde46fa5d2
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/video_engine/test/auto_test/source/vie_autotest_file.cc
View File

@ -33,6 +33,11 @@ public:
void ViEAutoTest::ViEFileStandardTest()
{
#ifdef WEBRTC_VIDEO_ENGINE_FILE_API
if (!FLAGS_include_timing_dependent_tests) {
ViETest::Log("Running in slow execution environment: skipping test...\n");
return;
}
//***************************************************************
// Begin create/initialize WebRTC Video Engine for testing
//***************************************************************
@ -270,7 +275,6 @@ void ViEAutoTest::ViEFileStandardTest()
AutoTestSleep(TEST_SPACING);
// GetCaptureDeviceSnapshot
if (FLAGS_include_timing_dependent_tests)
{
ViETest::Log("Testing GetCaptureDeviceSnapshot(int, ViEPicture)");
ViETest::Log("Taking a picture to use for displaying ViEPictures "
@ -318,7 +322,6 @@ void ViEAutoTest::ViEFileStandardTest()
AutoTestSleep(TEST_SPACING);
// GetCaptureDeviceSnapshot
if (FLAGS_include_timing_dependent_tests)
{
ViETest::Log("Testing GetCaptureDeviceSnapshot(int, char*)");
ViETest::Log("Taking snapshot from capture device %d", captureId);
@ -332,7 +335,6 @@ void ViEAutoTest::ViEFileStandardTest()
AutoTestSleep(TEST_SPACING);
// testing SetRenderStartImage(videoChannel, renderStartImage);
if (FLAGS_include_timing_dependent_tests)
{
ViETest::Log("Testing SetRenderStartImage(int, char*)");
// set render image, then stop capture and stop render to display it
@ -380,7 +382,6 @@ void ViEAutoTest::ViEFileStandardTest()
// testing SetRenderTimeoutImage(videoChannel, renderTimeoutFile,
// RENDER_TIMEOUT);
if (FLAGS_include_timing_dependent_tests)
{
ViETest::Log("Testing SetRenderTimeoutImage(int, char*)");
ViETest::Log("Stopping capture device to induce timeout of %d ms",

8
webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
View File

@ -256,9 +256,11 @@ void ViEAutoTest::ViERtpRtcpStandardTest()
tbChannel.videoChannel, sentTotalBitrate, sentVideoBitrate,
sentFecBitrate, sentNackBitrate));
EXPECT_GT(sentTotalBitrate, 0u);
EXPECT_GE(sentFecBitrate, 10u);
EXPECT_EQ(sentNackBitrate, 0u);
if (FLAGS_include_timing_dependent_tests) {
EXPECT_GT(sentTotalBitrate, 0u);
EXPECT_GE(sentFecBitrate, 10u);
EXPECT_EQ(sentNackBitrate, 0u);
}
EXPECT_EQ(0, ViE.base->StopSend(tbChannel.videoChannel));
EXPECT_EQ(0, ViE.rtp_rtcp->SetFECStatus(