diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 03:29:00 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 03:29:00 +0000 |
| commit | 8d21435c9992f833867b84d4a392f1832d0679fb (patch) | |
| tree | a4a4900cfa91f9fdb16e39cd144205d0c0130e6b /ash | |
| parent | 3ed941c54af40bfcc5f7d9101676d40ff7af5cd3 (diff) | |
| download | chromium_src-8d21435c9992f833867b84d4a392f1832d0679fb.zip chromium_src-8d21435c9992f833867b84d4a392f1832d0679fb.tar.gz chromium_src-8d21435c9992f833867b84d4a392f1832d0679fb.tar.bz2 | |
Disable LauncherViewIconObserverTest.AddRemoveWithMultipleDisplays on Windows
Fails on trybots on win7_aura
BUG=177135
TEST=none
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/12316002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/launcher/launcher_view_unittest.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ash/launcher/launcher_view_unittest.cc b/ash/launcher/launcher_view_unittest.cc index 1bd08ae..fd8c1f4 100644 --- a/ash/launcher/launcher_view_unittest.cc +++ b/ash/launcher/launcher_view_unittest.cc @@ -132,9 +132,17 @@ TEST_F(LauncherViewIconObserverTest, AddRemove) { observer()->Reset(); } +// Sometimes fails on trybots on win7_aura. http://crbug.com/177135 +#if defined(OS_WIN) +#define MAYBE_AddRemoveWithMultipleDisplays \ + DISABLED_AddRemoveWithMultipleDisplays +#else +#define MAYBE_AddRemoveWithMultipleDisplays \ + AddRemoveWithMultipleDisplays +#endif // Make sure creating/deleting an window on one displays notifies a // launcher on external display as well as one on primary. -TEST_F(LauncherViewIconObserverTest, AddRemoveWithMultipleDisplays) { +TEST_F(LauncherViewIconObserverTest, MAYBE_AddRemoveWithMultipleDisplays) { UpdateDisplay("400x400,400x400"); TestLauncherIconObserver second_observer(LauncherForSecondaryDisplay()); |