diff options
author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 00:44:02 +0000 |
---|---|---|
committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 00:44:02 +0000 |
commit | a1f31e0245332abadd6e6a4ae92545097dfebeb7 (patch) | |
tree | 58378a10b6d69acbb9c212eb589a549cf24a9154 | |
parent | a34f9bed8c1d0a158bb860ba325d7a566045f71b (diff) | |
download | chromium_src-a1f31e0245332abadd6e6a4ae92545097dfebeb7.zip chromium_src-a1f31e0245332abadd6e6a4ae92545097dfebeb7.tar.gz chromium_src-a1f31e0245332abadd6e6a4ae92545097dfebeb7.tar.bz2 |
Disable AppWindowAPI.TestRestoreGeometryCacheChange on Mac
Flaky failures, see bug
BUG=324915
TEST=browser_tests
R=asargent@chromium.org
Review URL: https://codereview.chromium.org/101613004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238497 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/apps/app_window_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/apps/app_window_browsertest.cc b/chrome/browser/apps/app_window_browsertest.cc index 383e2a5..69b82bab 100644 --- a/chrome/browser/apps/app_window_browsertest.cc +++ b/chrome/browser/apps/app_window_browsertest.cc @@ -115,7 +115,13 @@ IN_PROC_BROWSER_TEST_F(AppWindowAPI, DISABLED_TestRestoreAfterClose) { ASSERT_TRUE(RunAppWindowAPITest("testRestoreAfterClose")) << message_; } -IN_PROC_BROWSER_TEST_F(AppWindowAPI, TestRestoreGeometryCacheChange) { +// Flaky failures on mac_rel, see http://crbug.com/324915 +#if defined(OS_MACOSX) +#define MAYBE_TestRestoreGeometryCacheChange DISABLED_TestRestoreGeometryCacheChange +#else +#define MAYBE_TestRestoreGeometryCacheChange TestRestoreGeometryCacheChange +#endif +IN_PROC_BROWSER_TEST_F(AppWindowAPI, MAYBE_TestRestoreGeometryCacheChange) { // This test is similar to the other AppWindowAPI tests except that at some // point the app will send a 'ListenGeometryChange' message at which point the // test will check if the geometry cache entry for the test window has |