From 5dbe568417a91ae9f673e95342d2b0888a804db8 Mon Sep 17 00:00:00 2001
From: "phoglund@webrtc.org"
 <phoglund@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 11 May 2012 08:59:11 +0000
Subject: [PATCH] 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
---
 .../auto_test/automated/vie_video_verification_test.cc   | 4 +++-
 .../test/auto_test/source/vie_autotest_capture.cc        | 2 --
 .../test/auto_test/source/vie_autotest_codec.cc          | 2 --
 .../test/auto_test/source/vie_autotest_image_process.cc  | 1 -
 .../test/auto_test/source/vie_autotest_render.cc         | 1 -
 .../test/auto_test/source/vie_autotest_rtp_rtcp.cc       | 9 +++++----
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/video_engine/test/auto_test/automated/vie_video_verification_test.cc b/src/video_engine/test/auto_test/automated/vie_video_verification_test.cc
index a725deb23..d0f588c4a 100644
--- a/src/video_engine/test/auto_test/automated/vie_video_verification_test.cc
+++ b/src/video_engine/test/auto_test/automated/vie_video_verification_test.cc
@@ -184,7 +184,9 @@ TEST_F(ViEVideoVerificationTest, RunsCodecTestWithoutErrors)  {
 // 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
 // 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;
   local_file_renderer_ = new ViEToFileRenderer();
   remote_file_renderer_ = new FrameDropMonitoringRemoteFileRenderer(&detector);
diff --git a/src/video_engine/test/auto_test/source/vie_autotest_capture.cc b/src/video_engine/test/auto_test/source/vie_autotest_capture.cc
index f099898ef..4d840bf91 100644
--- a/src/video_engine/test/auto_test/source/vie_autotest_capture.cc
+++ b/src/video_engine/test/auto_test/source/vie_autotest_capture.cc
@@ -254,8 +254,6 @@ void ViEAutoTest::ViECaptureStandardTest() {
 }
 
 void ViEAutoTest::ViECaptureExtendedTest() {
-  ViECaptureStandardTest();
-  ViECaptureAPITest();
   ViECaptureExternalCaptureTest();
 }
 
diff --git a/src/video_engine/test/auto_test/source/vie_autotest_codec.cc b/src/video_engine/test/auto_test/source/vie_autotest_codec.cc
index 077f94b66..42b1f1687 100644
--- a/src/video_engine/test/auto_test/source/vie_autotest_codec.cc
+++ b/src/video_engine/test/auto_test/source/vie_autotest_codec.cc
@@ -264,8 +264,6 @@ void ViEAutoTest::ViECodecExtendedTest() {
     ViETest::Log("========================================");
     ViETest::Log(" ViECodec Extended Test\n");
 
-    ViECodecAPITest();
-    ViECodecStandardTest();
     ViECodecExternalCodecTest();
 
     TbInterfaces interfaces("ViECodecExtendedTest");
diff --git a/src/video_engine/test/auto_test/source/vie_autotest_image_process.cc b/src/video_engine/test/auto_test/source/vie_autotest_image_process.cc
index fe71508bb..c29d97d67 100644
--- a/src/video_engine/test/auto_test/source/vie_autotest_image_process.cc
+++ b/src/video_engine/test/auto_test/source/vie_autotest_image_process.cc
@@ -134,7 +134,6 @@ void ViEAutoTest::ViEImageProcessStandardTest()
 
 void ViEAutoTest::ViEImageProcessExtendedTest()
 {
-    ViEImageProcessStandardTest();
 }
 
 void ViEAutoTest::ViEImageProcessAPITest()
diff --git a/src/video_engine/test/auto_test/source/vie_autotest_render.cc b/src/video_engine/test/auto_test/source/vie_autotest_render.cc
index 2a73a6c2c..0c8ca222e 100644
--- a/src/video_engine/test/auto_test/source/vie_autotest_render.cc
+++ b/src/video_engine/test/auto_test/source/vie_autotest_render.cc
@@ -65,7 +65,6 @@ public:
                          bufferSize);
             return 0;
         }
-        ViETest::Log("callback DeliverFrame is good\n");
         return 0;
     }
 
diff --git a/src/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc b/src/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
index 4a5198aa4..7b623d19b 100644
--- a/src/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
+++ b/src/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
@@ -342,11 +342,14 @@ void ViEAutoTest::ViERtpRtcpStandardTest()
     fclose(inDump);
     FILE* outDump = fopen(outDumpName.c_str(), "r");
     fseek(outDump, 0L, SEEK_END);
-    long outEndPos = ftell(outDump);
+    // long outEndPos = ftell(outDump);
     fclose(outDump);
 
     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
     EXPECT_EQ(0, ViE.network->DeregisterSendTransport(tbChannel.videoChannel));
@@ -451,8 +454,6 @@ void ViEAutoTest::ViERtpRtcpExtendedTest()
     //***************************************************************
     //  Begin create/initialize WebRTC Video Engine for testing
     //***************************************************************
-    ViERtpRtcpStandardTest();
-
     // Create VIE
     TbInterfaces ViE("ViERtpRtcpExtendedTest");
     // Create a video channel