From 6f601afcf403adee91d4eae743902ca30f111a64 Mon Sep 17 00:00:00 2001
From: zijiehe <zijiehe@chromium.org>
Date: Mon, 7 Nov 2016 16:38:38 -0800
Subject: [PATCH] Disable ScreenCapturerIntegrationTests because of flaky

ScreenCapturerIntegrationTests are still flaky on Windows.

BUG=webrtc:6666

TBR=kjellander@webrtc.org

Review-Url: https://codereview.webrtc.org/2486553002
Cr-Commit-Position: refs/heads/master@{#14961}
---
 .../screen_capturer_integration_test.cc       | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc b/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc
index a7e344778e..bdb415dff7 100644
--- a/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc
+++ b/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc
@@ -228,7 +228,9 @@ TEST_F(ScreenCapturerIntegrationTest, DISABLED_CaptureUpdatedRegion) {
   TestCaptureUpdatedRegion();
 }
 
-TEST_F(ScreenCapturerIntegrationTest, TwoCapturers) {
+// Disabled because it's flaky.
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=6666
+TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoCapturers) {
   std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_);
   SetUp();
   TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
@@ -236,7 +238,10 @@ TEST_F(ScreenCapturerIntegrationTest, TwoCapturers) {
 
 #if defined(WEBRTC_WIN)
 
-TEST_F(ScreenCapturerIntegrationTest, CaptureUpdatedRegionWithDirectxCapturer) {
+// Disabled because it's flaky.
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=6666
+TEST_F(ScreenCapturerIntegrationTest,
+       DISABLED_CaptureUpdatedRegionWithDirectxCapturer) {
   if (!CreateDirectxCapturer()) {
     return;
   }
@@ -244,7 +249,9 @@ TEST_F(ScreenCapturerIntegrationTest, CaptureUpdatedRegionWithDirectxCapturer) {
   TestCaptureUpdatedRegion();
 }
 
-TEST_F(ScreenCapturerIntegrationTest, TwoDirectxCapturers) {
+// Disabled because it's flaky.
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=6666
+TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoDirectxCapturers) {
   if (!CreateDirectxCapturer()) {
     return;
   }
@@ -254,21 +261,27 @@ TEST_F(ScreenCapturerIntegrationTest, TwoDirectxCapturers) {
   TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
 }
 
+// Disabled because it's flaky.
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=6666
 TEST_F(ScreenCapturerIntegrationTest,
-       CaptureUpdatedRegionWithMagnifierCapturer) {
+       DISABLED_CaptureUpdatedRegionWithMagnifierCapturer) {
   CreateMagnifierCapturer();
   TestCaptureUpdatedRegion();
 }
 
-TEST_F(ScreenCapturerIntegrationTest, TwoMagnifierCapturers) {
+// Disabled because it's flaky.
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=6666
+TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoMagnifierCapturers) {
   CreateMagnifierCapturer();
   std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_);
   CreateMagnifierCapturer();
   TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
 }
 
+// Disabled because it's flaky.
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=6666
 TEST_F(ScreenCapturerIntegrationTest,
-       MaybeCaptureUpdatedRegionWithDirectxCapturer) {
+       DISABLED_MaybeCaptureUpdatedRegionWithDirectxCapturer) {
   // Even DirectX capturer is not supported in current system, we should be able
   // to select a usable capturer.
   MaybeCreateDirectxCapturer();