diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-09 18:49:37 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-09 18:49:37 +0000 |
| commit | 26fe47e55a8495af4b76fb2f7eef6b99d0503c2b (patch) | |
| tree | bb348a49147342da1052faf3fd26af6333bd9535 /ash/display | |
| parent | 2549dbc29aa9dce83decf565d3c881f7f8ee1d64 (diff) | |
| download | chromium_src-26fe47e55a8495af4b76fb2f7eef6b99d0503c2b.zip chromium_src-26fe47e55a8495af4b76fb2f7eef6b99d0503c2b.tar.gz chromium_src-26fe47e55a8495af4b76fb2f7eef6b99d0503c2b.tar.bz2 | |
Disable two display-related ash_unittests on Win8 Aura
DisplayManagerTest.EnsurePointerInDisplays_2ndOnLeft
DisplayControllerTest.CursorDeviceScaleFactorSwapPrimary
BUG=239539,237642
TEST=ash_unittests
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/14773019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/display_controller_unittest.cc | 10 | ||||
| -rw-r--r-- | ash/display/display_manager_unittest.cc | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc index 8ac928d..e1a98ae 100644 --- a/ash/display/display_controller_unittest.cc +++ b/ash/display/display_controller_unittest.cc @@ -601,7 +601,15 @@ TEST_F(DisplayControllerTest, MAYBE_SwapPrimaryById) { EXPECT_TRUE(primary_root->Contains(launcher_window)); } -TEST_F(DisplayControllerTest, CursorDeviceScaleFactorSwapPrimary) { +#if defined(OS_WIN) +// Flaky failures on Win8 due to window activation messages. crbug.com/239539 +#define MAYBE_CursorDeviceScaleFactorSwapPrimary \ + DISABLED_CursorDeviceScaleFactorSwapPrimary +#else +#define MAYBE_CursorDeviceScaleFactorSwapPrimary \ + CursorDeviceScaleFactorSwapPrimary +#endif +TEST_F(DisplayControllerTest, MAYBE_CursorDeviceScaleFactorSwapPrimary) { DisplayController* display_controller = Shell::GetInstance()->display_controller(); diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc index 6fe5deb..cfe6458 100644 --- a/ash/display/display_manager_unittest.cc +++ b/ash/display/display_manager_unittest.cc @@ -592,7 +592,15 @@ TEST_F(DisplayManagerTest, EnsurePointerInDisplays) { EXPECT_EQ("150,140", env->last_mouse_location().ToString()); } -TEST_F(DisplayManagerTest, EnsurePointerInDisplays_2ndOnLeft) { +#if defined(OS_WIN) +// Flaky failures on Win8 due to window activation messages. crbug.com/239539 +#define MAYBE_EnsurePointerInDisplays_2ndOnLeft \ + DISABLED_EnsurePointerInDisplays_2ndOnLeft +#else +#define MAYBE_EnsurePointerInDisplays_2ndOnLeft \ + EnsurePointerInDisplays_2ndOnLeft +#endif +TEST_F(DisplayManagerTest, MAYBE_EnsurePointerInDisplays_2ndOnLeft) { // Set the 2nd display on the left. DisplayController* display_controller = Shell::GetInstance()->display_controller(); |