Disabled flaky tests. Standard tests will no longer run within extended tests.

BUG=
TEST=

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2230 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
phoglund@webrtc.org 2012-05-11 08:59:11 +00:00
parent 61d0745e86
commit 5dbe568417
6 changed files with 8 additions and 11 deletions

View File

@ -184,7 +184,9 @@ TEST_F(ViEVideoVerificationTest, RunsCodecTestWithoutErrors) {
// in the encoder. The local and remote file will not be of equal size because // in the encoder. The local and remote file will not be of equal size because
// of unknown reasons. Tests show that they start at the same frame, which is // of unknown reasons. Tests show that they start at the same frame, which is
// the important thing when doing frame-to-frame comparison with PSNR/SSIM. // the important thing when doing frame-to-frame comparison with PSNR/SSIM.
TEST_F(ViEVideoVerificationTest, RunsFullStackWithoutErrors) { // TODO(phoglund): This is flaky and a bit incomplete - enable again when it has
// been made more deterministic.
TEST_F(ViEVideoVerificationTest, DISABLED_RunsFullStackWithoutErrors) {
FrameDropDetector detector; FrameDropDetector detector;
local_file_renderer_ = new ViEToFileRenderer(); local_file_renderer_ = new ViEToFileRenderer();
remote_file_renderer_ = new FrameDropMonitoringRemoteFileRenderer(&detector); remote_file_renderer_ = new FrameDropMonitoringRemoteFileRenderer(&detector);

View File

@ -254,8 +254,6 @@ void ViEAutoTest::ViECaptureStandardTest() {
} }
void ViEAutoTest::ViECaptureExtendedTest() { void ViEAutoTest::ViECaptureExtendedTest() {
ViECaptureStandardTest();
ViECaptureAPITest();
ViECaptureExternalCaptureTest(); ViECaptureExternalCaptureTest();
} }

View File

@ -264,8 +264,6 @@ void ViEAutoTest::ViECodecExtendedTest() {
ViETest::Log("========================================"); ViETest::Log("========================================");
ViETest::Log(" ViECodec Extended Test\n"); ViETest::Log(" ViECodec Extended Test\n");
ViECodecAPITest();
ViECodecStandardTest();
ViECodecExternalCodecTest(); ViECodecExternalCodecTest();
TbInterfaces interfaces("ViECodecExtendedTest"); TbInterfaces interfaces("ViECodecExtendedTest");

View File

@ -134,7 +134,6 @@ void ViEAutoTest::ViEImageProcessStandardTest()
void ViEAutoTest::ViEImageProcessExtendedTest() void ViEAutoTest::ViEImageProcessExtendedTest()
{ {
ViEImageProcessStandardTest();
} }
void ViEAutoTest::ViEImageProcessAPITest() void ViEAutoTest::ViEImageProcessAPITest()

View File

@ -65,7 +65,6 @@ public:
bufferSize); bufferSize);
return 0; return 0;
} }
ViETest::Log("callback DeliverFrame is good\n");
return 0; return 0;
} }

View File

@ -342,11 +342,14 @@ void ViEAutoTest::ViERtpRtcpStandardTest()
fclose(inDump); fclose(inDump);
FILE* outDump = fopen(outDumpName.c_str(), "r"); FILE* outDump = fopen(outDumpName.c_str(), "r");
fseek(outDump, 0L, SEEK_END); fseek(outDump, 0L, SEEK_END);
long outEndPos = ftell(outDump); // long outEndPos = ftell(outDump);
fclose(outDump); fclose(outDump);
EXPECT_GT(inEndPos, 0); EXPECT_GT(inEndPos, 0);
EXPECT_LT(inEndPos, outEndPos + 100);
// TODO(phoglund): This is flaky for some reason. Are the sleeps too
// short above?
// EXPECT_LT(inEndPos, outEndPos + 100);
// Deregister external transport // Deregister external transport
EXPECT_EQ(0, ViE.network->DeregisterSendTransport(tbChannel.videoChannel)); EXPECT_EQ(0, ViE.network->DeregisterSendTransport(tbChannel.videoChannel));
@ -451,8 +454,6 @@ void ViEAutoTest::ViERtpRtcpExtendedTest()
//*************************************************************** //***************************************************************
// Begin create/initialize WebRTC Video Engine for testing // Begin create/initialize WebRTC Video Engine for testing
//*************************************************************** //***************************************************************
ViERtpRtcpStandardTest();
// Create VIE // Create VIE
TbInterfaces ViE("ViERtpRtcpExtendedTest"); TbInterfaces ViE("ViERtpRtcpExtendedTest");
// Create a video channel // Create a video channel