Skip to content

Commit

Permalink
Wrap in IS_FAST_BUILD like similar tests, to avoid flakes
Browse files Browse the repository at this point in the history
TBR=aboxhall@chromium.org

Bug: 1141280
Change-Id: I4682a0ed73e14bc8243bb57326334d0db752fa4a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518625
Reviewed-by: Aaron Leventhal <aleventhal@chromium.org>
Commit-Queue: Aaron Leventhal <aleventhal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824899}
  • Loading branch information
aleventhal authored and Commit Bot committed Nov 6, 2020
1 parent e1a6912 commit 764e7bc
Showing 1 changed file with 4 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@
!defined(THREAD_SANITIZER) && !defined(UNDEFINED_SANITIZER) && \
!defined(OS_ANDROID)
#define IS_FAST_BUILD
#endif

constexpr int kDelayForDeferredUpdatesAfterPageLoad = 150;
#endif

namespace content {

Expand Down Expand Up @@ -1476,16 +1475,9 @@ IN_PROC_BROWSER_TEST_F(
EXPECT_GT(bounds.y(), 0);
}

// http://crbug.com/1141280
#if defined(OS_LINUX)
#define MAYBE_NonInteractiveChangesAreBatched \
DISABLED_NonInteractiveChangesAreBatched
#else
#define MAYBE_NonInteractiveChangesAreBatched NonInteractiveChangesAreBatched
#endif

#if defined(IS_FAST_BUILD) // Avoid flakiness on slower debug/sanitizer builds.
IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
MAYBE_NonInteractiveChangesAreBatched) {
NonInteractiveChangesAreBatched) {
// Ensure that normal DOM changes are batched together, and do not occur
// more than once every kDelayForDeferredUpdatesAfterPageLoad.
const char url_str[] =
Expand Down Expand Up @@ -1537,6 +1529,7 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
EXPECT_GT(num_batches, 1);
EXPECT_LE(num_batches, 1000 / kDelayForDeferredUpdatesAfterPageLoad + 1);
}
#endif

#if defined(IS_FAST_BUILD) // Avoid flakiness on slower debug/sanitizer builds.
IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
Expand Down

0 comments on commit 764e7bc

Please sign in to comment.