diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 12:43:29 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 12:43:29 +0000 |
| commit | 75a5591a6b329b8b12605ea4500c487e3789295c (patch) | |
| tree | 3caebf040466be31810e3fdd992ea6942a98253c | |
| parent | 518902dd37c744b0c1d49f1bb01cd17df165b442 (diff) | |
| download | chromium_src-75a5591a6b329b8b12605ea4500c487e3789295c.zip chromium_src-75a5591a6b329b8b12605ea4500c487e3789295c.tar.gz chromium_src-75a5591a6b329b8b12605ea4500c487e3789295c.tar.bz2 | |
Disable FullscreenControllerInteractiveTest:TestTabExitsMouseLockOn{Navigation,GoBack} on Windows
They are very flaky on Vista.
http://chromium-build-logs.appspot.com/gtest_query?gtest_query=FullscreenControllerInteractiveTest.TestTabExitsMouseLockOnNavigation
http://chromium-build-logs.appspot.com/gtest_query?gtest_query=FullscreenControllerInteractiveTest.TestTabExitsMouseLockOnGoBack
BUG=158762
TBR=scheib@chromium.org
Review URL: https://codereview.chromium.org/11369021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165347 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc index e115f81..39cfaf0 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc @@ -698,9 +698,23 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, ASSERT_TRUE(IsMouseLocked()); } +#if defined(OS_WIN) +// These tests are very flaky on Vista. +// http://crbug.com/158762 +#define MAYBE_TestTabExitsMouseLockOnNavigation \ + DISABLED_TestTabExitsMouseLockOnNavigation +#define MAYBE_TestTabExitsMouseLockOnGoBack \ + DISABLED_TestTabExitsMouseLockOnGoBack +#else +#define MAYBE_TestTabExitsMouseLockOnNavigation \ + TestTabExitsMouseLockOnNavigation +#define MAYBE_TestTabExitsMouseLockOnGoBack \ + TestTabExitsMouseLockOnGoBack +#endif + // Tests mouse lock is exited on page navigation. IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, - TestTabExitsMouseLockOnNavigation) { + MAYBE_TestTabExitsMouseLockOnNavigation) { ASSERT_TRUE(test_server()->Start()); ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(kFullscreenMouseLockHTML)); @@ -725,7 +739,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, // Tests mouse lock is exited when navigating back. IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, - TestTabExitsMouseLockOnGoBack) { + MAYBE_TestTabExitsMouseLockOnGoBack) { ASSERT_TRUE(test_server()->Start()); // Navigate twice to provide a place to go back to. |