Skip to content

Commit

Permalink
Disable drag-and-drop tests that are flaky on CrOS with OOPIFs.
Browse files Browse the repository at this point in the history
Bug: 835572, 835573
Change-Id: I76a2d7407d376a92c0dea7649bc877349d862f2f
Reviewed-on: https://chromium-review.googlesource.com/1024233
Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552752}
  • Loading branch information
anforowicz authored and Commit Bot committed Apr 23, 2018
1 parent a1b0ba7 commit 0367aff
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions chrome/browser/ui/views/drag_and_drop_interactive_uitest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -817,9 +817,12 @@ IN_PROC_BROWSER_TEST_P(DragAndDropBrowserTest, DragStartInFrame) {
SimulateMouseUp();
}

#if defined(OS_WIN)
// There is no known way to execute test-controlled tasks during
// a drag-and-drop loop run by Windows OS.
#if defined(OS_WIN)
#define MAYBE_DragImageBetweenFrames DISABLED_DragImageBetweenFrames
#elif defined(OS_CHROMEOS)
// Flakiness on CrOS tracked by https://crbug.com/835573.
#define MAYBE_DragImageBetweenFrames DISABLED_DragImageBetweenFrames
#else
#define MAYBE_DragImageBetweenFrames DragImageBetweenFrames
Expand Down Expand Up @@ -1032,9 +1035,13 @@ void DragAndDropBrowserTest::DragImageBetweenFrames_Step3(
{"dragstart", "dragleave", "dragenter", "dragend"}));
}

#if defined(OS_WIN)
// There is no known way to execute test-controlled tasks during
// a drag-and-drop loop run by Windows OS.
#if defined(OS_WIN) || defined(OS_CHROMEOS)
#define MAYBE_DragImageFromDisappearingFrame \
DISABLED_DragImageFromDisappearingFrame
#elif defined(OS_CHROMEOS)
// Flakiness on CrOS tracked by https://crbug.com/835572.
#define MAYBE_DragImageFromDisappearingFrame \
DISABLED_DragImageFromDisappearingFrame
#else
Expand Down

0 comments on commit 0367aff

Please sign in to comment.