Commit 0670ebfc authored by Makoto Shimazu's avatar Makoto Shimazu Committed by Commit Bot

Disable InputHandlerProxyEventQueueTest.VSyncAlignedGestureScrollPinchScroll

It's flaky on win-asan bots.

TBR=dtapuska@chromium.org

No-Try: true
Bug: 1030589
Change-Id: I317d93e60daf8be5d5813307da487f7b58efedc4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1949836Reviewed-by: default avatarMakoto Shimazu <shimazu@chromium.org>
Commit-Queue: Makoto Shimazu <shimazu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721380}
parent d51c7590
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "base/test/simple_test_tick_clock.h" #include "base/test/simple_test_tick_clock.h"
#include "base/test/task_environment.h" #include "base/test/task_environment.h"
#include "base/test/trace_event_analyzer.h" #include "base/test/trace_event_analyzer.h"
#include "build/build_config.h"
#include "cc/input/main_thread_scrolling_reason.h" #include "cc/input/main_thread_scrolling_reason.h"
#include "cc/trees/swap_promise_monitor.h" #include "cc/trees/swap_promise_monitor.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
...@@ -1596,7 +1597,16 @@ TEST_F(InputHandlerProxyEventQueueTest, VSyncAlignedGestureScroll) { ...@@ -1596,7 +1597,16 @@ TEST_F(InputHandlerProxyEventQueueTest, VSyncAlignedGestureScroll) {
testing::Mock::VerifyAndClearExpectations(&mock_input_handler_); testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);
} }
TEST_F(InputHandlerProxyEventQueueTest, VSyncAlignedGestureScrollPinchScroll) { // Disabled due to random failures on win-asan: https://crbug.com/1030589.
#if defined(ADDRESS_SANITIZER) && defined(OS_WIN)
#define MAYBE_VSyncAlignedGestureScrollPinchScroll \
DISABLED_VSyncAlignedGestureScrollPinchScroll
#else
#define MAYBE_VSyncAlignedGestureScrollPinchScroll \
VSyncAlignedGestureScrollPinchScroll
#endif
TEST_F(InputHandlerProxyEventQueueTest,
MAYBE_VSyncAlignedGestureScrollPinchScroll) {
// Handle scroll on compositor. // Handle scroll on compositor.
cc::InputHandlerScrollResult scroll_result_did_scroll_; cc::InputHandlerScrollResult scroll_result_did_scroll_;
scroll_result_did_scroll_.did_scroll = true; scroll_result_did_scroll_.did_scroll = true;
......
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