From 0cab085157fb55f1b61e6700fe636895d9164e9a Mon Sep 17 00:00:00 2001 From: Zijie He Date: Thu, 24 Aug 2017 11:30:02 -0700 Subject: [PATCH] Disable screen capturer tests on Windows Windows cannot capture contents on VMs hosted in GCE, disable them to unblock GCE hosting. Bug: webrtc:8153 Change-Id: Iacdce15008cc092dce36d08b1d5565bbaa5def1f Reviewed-on: https://chromium-review.googlesource.com/634083 Reviewed-by: Henrik Kjellander Commit-Queue: Zijie He Cr-Commit-Position: refs/heads/master@{#19502} --- .../screen_capturer_integration_test.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc b/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc index 96a8084a46..0ec76c47bf 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc +++ b/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc @@ -310,7 +310,10 @@ TEST_F(ScreenCapturerIntegrationTest, MAYBE_TwoCapturers) { #if defined(WEBRTC_WIN) -TEST_F(ScreenCapturerIntegrationTest, CaptureUpdatedRegionWithDirectxCapturer) { +// Windows cannot capture contents on VMs hosted in GCE. See bug +// https://bugs.chromium.org/p/webrtc/issues/detail?id=8153. +TEST_F(ScreenCapturerIntegrationTest, + DISABLED_CaptureUpdatedRegionWithDirectxCapturer) { if (!CreateDirectxCapturer()) { return; } @@ -318,7 +321,7 @@ TEST_F(ScreenCapturerIntegrationTest, CaptureUpdatedRegionWithDirectxCapturer) { TestCaptureUpdatedRegion(); } -TEST_F(ScreenCapturerIntegrationTest, TwoDirectxCapturers) { +TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoDirectxCapturers) { if (!CreateDirectxCapturer()) { return; } @@ -329,7 +332,7 @@ TEST_F(ScreenCapturerIntegrationTest, TwoDirectxCapturers) { } TEST_F(ScreenCapturerIntegrationTest, - CaptureUpdatedRegionWithMagnifierCapturer) { + DISABLED_CaptureUpdatedRegionWithMagnifierCapturer) { // On Windows 8 or later, magnifier APIs return a frame with a border on test // environment, so disable these tests. // Bug https://bugs.chromium.org/p/webrtc/issues/detail?id=6844 @@ -342,7 +345,7 @@ TEST_F(ScreenCapturerIntegrationTest, TestCaptureUpdatedRegion(); } -TEST_F(ScreenCapturerIntegrationTest, TwoMagnifierCapturers) { +TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoMagnifierCapturers) { // On Windows 8 or later, magnifier APIs return a frame with a border on test // environment, so disable these tests. // Bug https://bugs.chromium.org/p/webrtc/issues/detail?id=6844 @@ -358,7 +361,7 @@ TEST_F(ScreenCapturerIntegrationTest, TwoMagnifierCapturers) { } TEST_F(ScreenCapturerIntegrationTest, - MaybeCaptureUpdatedRegionWithDirectxCapturer) { + DISABLED_MaybeCaptureUpdatedRegionWithDirectxCapturer) { if (!rtc::IsWindows8OrLater()) { // ScreenCapturerWinGdi randomly returns blank screen, the root cause is // still unknown. Bug,