diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 05:20:02 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 05:20:02 +0000 |
| commit | 656c8883d77b1bb78afffc6c40b4d96d3dee3067 (patch) | |
| tree | 79d313f94c5c91d0e306d4edfc32ce14ff858e01 /ash/accelerators | |
| parent | 943528e092b0a1c242c75af60c7b08385908e954 (diff) | |
| download | chromium_src-656c8883d77b1bb78afffc6c40b4d96d3dee3067.zip chromium_src-656c8883d77b1bb78afffc6c40b4d96d3dee3067.tar.gz chromium_src-656c8883d77b1bb78afffc6c40b4d96d3dee3067.tar.bz2 | |
disable AcceleratorControllerTest.GlobalAcceleratorsToggleAppList on win aura
Failing on Win Aura bots flakily for a few days, and now quite a lot. No
clear regression cause though.
R=kbr@chromium.org
TBR=kbr@chromium.org
BUG=316012
Review URL: https://codereview.chromium.org/63783002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index 2f8b034..e6934a2 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -966,7 +966,15 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) { #endif } -TEST_F(AcceleratorControllerTest, GlobalAcceleratorsToggleAppList) { +#if defined(OS_WIN) && defined(USE_AURA) +// Bug 316012. +#define MAYBE_GlobalAcceleratorsToggleAppList \ + DISABLED_GlobalAcceleratorsToggleAppList +#else +#define MAYBE_GlobalAcceleratorsToggleAppList GlobalAcceleratorsToggleAppList +#endif + +TEST_F(AcceleratorControllerTest, MAYBE_GlobalAcceleratorsToggleAppList) { AccessibilityDelegate* delegate = ash::Shell::GetInstance()->accessibility_delegate(); EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility()); |