diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-27 05:56:58 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-27 05:56:58 +0000 |
| commit | 9297ef331dbf59ee9538d6430a9ebe27de3e858d (patch) | |
| tree | 66ca397b16b03e954aef2f522996af3bc1e723c9 /ash | |
| parent | 620b151f7e489e3816b60b3603ed240641766ab2 (diff) | |
| download | chromium_src-9297ef331dbf59ee9538d6430a9ebe27de3e858d.zip chromium_src-9297ef331dbf59ee9538d6430a9ebe27de3e858d.tar.gz chromium_src-9297ef331dbf59ee9538d6430a9ebe27de3e858d.tar.bz2 | |
Disable two tests in MultiDisplayManagerTest on Win Aura.
BUG=158163
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/11309018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/display/multi_display_manager_unittest.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/ash/display/multi_display_manager_unittest.cc b/ash/display/multi_display_manager_unittest.cc index 343981b..cb349cf 100644 --- a/ash/display/multi_display_manager_unittest.cc +++ b/ash/display/multi_display_manager_unittest.cc @@ -392,7 +392,18 @@ TEST_F(MultiDisplayManagerTest, MAYBE_TestNativeDisplaysChanged) { FindDisplayForId(internal_display_id).bounds().ToString()); } -TEST_F(MultiDisplayManagerTest, EnsurePointerInDisplays) { +#if defined(OS_CHROMEOS) +#define MAYBE_EnsurePointerInDisplays EnsurePointerInDisplays +#define MAYBE_EnsurePointerInDisplays_2ndOnLeft \ + EnsurePointerInDisplays_2ndOnLeft +#else +// TODO(oshima): Re-enable these tests on WinAura (http://crbug.com/158163). +#define MAYBE_EnsurePointerInDisplays DISABLED_EnsurePointerInDisplays +#define MAYBE_EnsurePointerInDisplays_2ndOnLeft \ + DISABLED_EnsurePointerInDisplays_2ndOnLeft +#endif + +TEST_F(MultiDisplayManagerTest, MAYBE_EnsurePointerInDisplays) { UpdateDisplay("200x200,300x300"); Shell::RootWindowList root_windows = Shell::GetAllRootWindows(); @@ -430,7 +441,7 @@ TEST_F(MultiDisplayManagerTest, EnsurePointerInDisplays) { EXPECT_EQ("150,140", env->last_mouse_location().ToString()); } -TEST_F(MultiDisplayManagerTest, EnsurePointerInDisplays_2ndOnLeft) { +TEST_F(MultiDisplayManagerTest, MAYBE_EnsurePointerInDisplays_2ndOnLeft) { UpdateDisplay("200x200,300x300"); Shell::RootWindowList root_windows = Shell::GetAllRootWindows(); |