diff options
| author | jonross <jonross@chromium.org> | 2015-03-10 08:14:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-10 15:15:10 +0000 |
| commit | 7185d9d33461634fbdde9912e95189ae63623785 (patch) | |
| tree | 3f2c1287cdcd7f187ac3d499872f3e7cca6b508c /ash/test | |
| parent | 6a5a246814adb820e6daf1de37215d3047bb3831 (diff) | |
| download | chromium_src-7185d9d33461634fbdde9912e95189ae63623785.zip chromium_src-7185d9d33461634fbdde9912e95189ae63623785.tar.gz chromium_src-7185d9d33461634fbdde9912e95189ae63623785.tar.bz2 | |
Remove the message loop wait that changes timing of tests on valgrind. None of the tests are checking for delayed state changes, so the waits are unnecessary.
Remove the filter to test failures on the bots.
TEST=ShelfViewTest.AppListButtonTouchFeedback, ShelfViewTest.AppListButtonTouchFeedbackCancellation, SystemTrayTest.TrayPopupItemContainerTouchFeedback, SystemTrayTest.TrayPopupItemContainerTouchFeedbackCancellation, TrayDetailsViewTest.HoverHighlightViewTouchFeedback, TrayDetailsViewTest.HoverHighlightViewTouchFeedbackCancellation, TrayDetailsViewTest.TrayPopupHeaderButtonTouchFeedback, TrayDetailsViewTest.TrayPopupHeaderButtonTouchFeedbackCancellation, WebNotificationTrayTest.TouchFeedback, WebNotificationTrayTest.TouchFeedbackCancellation
BUG=421888
Review URL: https://codereview.chromium.org/968873005
Cr-Commit-Position: refs/heads/master@{#319881}
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/ash_test_base.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index 93b4b98..2aada0f 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc @@ -134,9 +134,14 @@ void AshTestBase::SetUp() { Shell::GetPrimaryRootWindow()->MoveCursorTo(gfx::Point(-1000, -1000)); ash::Shell::GetInstance()->cursor_manager()->EnableMouseEvents(); - // Changing GestureConfiguration shouldn't make tests fail. - ui::GestureConfiguration::GetInstance() - ->set_max_touch_move_in_pixels_for_click(5); + // Changing GestureConfiguration shouldn't make tests fail. These values + // prevent unexpected events from being generated during tests. Such as + // delayed events which create race conditions on slower tests. + ui::GestureConfiguration* gesture_config = + ui::GestureConfiguration::GetInstance(); + gesture_config->set_max_touch_down_duration_for_click_in_ms(800); + gesture_config->set_long_press_time_in_ms(1000); + gesture_config->set_max_touch_move_in_pixels_for_click(5); #if defined(OS_WIN) if (!command_line->HasSwitch(ash::switches::kForceAshToDesktop)) { |