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

Disable screen capturer tests on Windows

Browse Source 
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 <kjellander@webrtc.org>
Commit-Queue: Zijie He <zijiehe@chromium.org>
Cr-Commit-Position: refs/heads/master@{#19502}
This commit is contained in:
Zijie He 2017-08-24 11:30:02 -07:00 committed by Commit Bot
parent c0af5ac3d0
commit 0cab085157
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webrtc/modules/desktop_capture/screen_capturer_integration_test.cc
View File

@ -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,