summaryrefslogtreecommitdiffstats
path: root/ash/extended_desktop_unittest.cc
diff options
context:
space:
mode:
authorhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-25 05:53:33 +0000
committerhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-25 05:53:33 +0000
commit608f02fee7ce770c70b3f7eb9be1d0beeebe96d9 (patch)
tree27e182e87a832d866fb053694418b32759f63e41 /ash/extended_desktop_unittest.cc
parentccb849a47681bc77e35aebe2b49e70ac0fffbb73 (diff)
downloadchromium_src-608f02fee7ce770c70b3f7eb9be1d0beeebe96d9.zip
chromium_src-608f02fee7ce770c70b3f7eb9be1d0beeebe96d9.tar.gz
chromium_src-608f02fee7ce770c70b3f7eb9be1d0beeebe96d9.tar.bz2
Disable ExtendedDesktopTest.MoveWindowToDisplay on Windows.
This change disables ExtendedDesktopTest.MoveWindowToDisplay, which started failing on the "Win Aura" bot since Build 23790. TBR=sky BUG=157817 TEST=make the "Win Aura" bot green. Review URL: https://codereview.chromium.org/11266032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164022 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/extended_desktop_unittest.cc')
-rw-r--r--ash/extended_desktop_unittest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index b1ae08a..7c76958 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -401,7 +401,13 @@ TEST_F(ExtendedDesktopTest, MoveWindow) {
EXPECT_EQ(root_windows[0], d1->GetNativeView()->GetRootWindow());
}
-TEST_F(ExtendedDesktopTest, MoveWindowToDisplay) {
+// This test fails on the "Win Aura" bot: <http://crbug.com/157817>.
+#if defined(OS_WIN)
+#define MAYBE_MoveWindowToDisplay DISABLED_MoveWindowToDisplay
+#else
+#define MAYBE_MoveWindowToDisplay MoveWindowToDisplay
+#endif
+TEST_F(ExtendedDesktopTest, MAYBE_MoveWindowToDisplay) {
UpdateDisplay("1000x1000,1000x1000");
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();