Commit 69d49837 authored by Hajime Hoshi's avatar Hajime Hoshi Committed by Commit Bot

Reland "[Sheriff] Disable the test"

This reverts commit ef0ab61f.

Reason for revert: The test still fails: https://ci.chromium.org/p/chromium/builders/ci/linux-lacros-tester-rel/1158

Original change's description:
> Revert "[Sheriff] Disable the test"
> 
> This reverts commit af48c8e6.
> 
> Reason for revert: Test works now.
> 
> Original change's description:
> > [Sheriff] Disable the test
> > 
> > Disable the failing test on Linux.
> > 
> > Bug=1108205
> > TBR=miu@chromium.org
> > 
> > Change-Id: Ie388ca75a2fadce937d613994847217e7f9579fc
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2310271
> > Reviewed-by: Hayato Ito <hayato@chromium.org>
> > Commit-Queue: Hayato Ito <hayato@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#790745}
> 
> TBR=miu@chromium.org,hayato@chromium.org
> 
> # Not skipping CQ checks because original CL landed > 1 day ago.
> 
> Change-Id: I4c43284f7d4a0fec1cd4c05fc375f1f4d406526b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2361023
> Reviewed-by: Yuri Wiitala <miu@chromium.org>
> Commit-Queue: Yuri Wiitala <miu@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#799428}

TBR=miu@chromium.org,hayato@chromium.org

# Not skipping CQ checks because this is a reland.

Change-Id: Ibc06b68b65131cc9f3220ec36084f89eaf08ce59
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2362494Reviewed-by: default avatarHajime Hoshi <hajimehoshi@chromium.org>
Commit-Queue: Hajime Hoshi <hajimehoshi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799504}
parent 889a439f
...@@ -400,8 +400,15 @@ INSTANTIATE_TEST_SUITE_P( ...@@ -400,8 +400,15 @@ INSTANTIATE_TEST_SUITE_P(
// whether the browser is running with software compositing or GPU-accelerated // whether the browser is running with software compositing or GPU-accelerated
// compositing, whether the WebContents is visible/hidden or occluded/unoccluded // compositing, whether the WebContents is visible/hidden or occluded/unoccluded
// and whether the main document contains a cross-site iframe. // and whether the main document contains a cross-site iframe.
// Fails on Linux only. http://crbug.com/1108205
#if defined(OS_LINUX)
#define MAYBE_CapturesContentChanges DISABLED_CapturesContentChanges
#else
#define MAYBE_CapturesContentChanges CapturesContentChanges
#endif
IN_PROC_BROWSER_TEST_P(WebContentsVideoCaptureDeviceBrowserTestP, IN_PROC_BROWSER_TEST_P(WebContentsVideoCaptureDeviceBrowserTestP,
CapturesContentChanges) { MAYBE_CapturesContentChanges) {
SCOPED_TRACE(testing::Message() SCOPED_TRACE(testing::Message()
<< "Test parameters: " << "Test parameters: "
<< (IsSoftwareCompositingTest() ? "Software Compositing" << (IsSoftwareCompositingTest() ? "Software Compositing"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment