diff options
| author | zturner@chromium.org <zturner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-11 21:53:32 +0000 |
|---|---|---|
| committer | zturner@chromium.org <zturner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-11 21:53:32 +0000 |
| commit | f096694b46d1e5ebe6d7dc518e760ceb6cc2872d (patch) | |
| tree | 93e049ec8895a2a12aaacf959768409ba028b752 /ash/accelerators | |
| parent | bc6b37328b966d7f1dcaafb8c2c0a1a4c2ee90fb (diff) | |
| download | chromium_src-f096694b46d1e5ebe6d7dc518e760ceb6cc2872d.zip chromium_src-f096694b46d1e5ebe6d7dc518e760ceb6cc2872d.tar.gz chromium_src-f096694b46d1e5ebe6d7dc518e760ceb6cc2872d.tar.bz2 | |
Disable ProcessOnce on Ash due to flakiness.
BUG=317592
TBR=mpearson
Review URL: https://codereview.chromium.org/59273003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index ef9a831..31df7e3 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -596,8 +596,15 @@ TEST_F(AcceleratorControllerTest, MAYBE_SuppressToggleMaximized) { EXPECT_FALSE(window_state->IsMaximized()); } +#if defined(OS_WIN) && defined(USE_AURA) +// crbug.com/317592 +#define MAYBE_ProcessOnce DISABLED_ProcessOnce +#else +#define MAYBE_ProcessOnce ProcessOnce +#endif + #if defined(OS_WIN) || defined(USE_X11) -TEST_F(AcceleratorControllerTest, ProcessOnce) { +TEST_F(AcceleratorControllerTest, MAYBE_ProcessOnce) { ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE); TestTarget target; GetController()->Register(accelerator_a, &target); |