diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 18:22:10 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 18:23:29 +0000 |
| commit | afe57e5825a8c39288d48e807954b77f2dad8761 (patch) | |
| tree | bdd39833368cfbee5ce8f1f15dd9acac02637305 | |
| parent | cc4debe30d1d48c0870e29e887132fe8fd8dff25 (diff) | |
| download | chromium_src-afe57e5825a8c39288d48e807954b77f2dad8761.zip chromium_src-afe57e5825a8c39288d48e807954b77f2dad8761.tar.gz chromium_src-afe57e5825a8c39288d48e807954b77f2dad8761.tar.bz2 | |
Disable AppWindowInteractiveTest.ESCLeavesFullscreenDOM and AppWindowInteractiveTest.ESCDoesNotLeaveFullscreenWindow as they are flaky on Mac.
TBR=mlamouri@chromium.org
BUG=406009
Review URL: https://codereview.chromium.org/490293002
Cr-Commit-Position: refs/heads/master@{#291135}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291135 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/apps/app_window_interactive_uitest.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/chrome/browser/apps/app_window_interactive_uitest.cc b/chrome/browser/apps/app_window_interactive_uitest.cc index 3aad631..cd1158e 100644 --- a/chrome/browser/apps/app_window_interactive_uitest.cc +++ b/chrome/browser/apps/app_window_interactive_uitest.cc @@ -126,7 +126,13 @@ IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, ESCLeavesFullscreenWindow) { } } -IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, ESCLeavesFullscreenDOM) { +#if defined(OS_MACOSX) +// http://crbug.com/406009 +#define MAYBE_ESCLeavesFullscreenDOM DISABLED_ESCLeavesFullscreenDOM +#else +#define MAYBE_ESCLeavesFullscreenDOM ESCLeavesFullscreenDOM +#endif +IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_ESCLeavesFullscreenDOM) { // This test is flaky on MacOS 10.6. #if defined(OS_MACOSX) && !defined(OS_IOS) if (base::mac::IsOSSnowLeopard()) @@ -176,8 +182,14 @@ IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, ESCLeavesFullscreenDOM) { } } +#if defined(OS_MACOSX) +// http://crbug.com/406009 +#define MAYBE_ESCDoesNotLeaveFullscreenWindow DISABLED_ESCDoesNotLeaveFullscreenWindow +#else +#define MAYBE_ESCDoesNotLeaveFullscreenWindow ESCDoesNotLeaveFullscreenWindow +#endif IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, - ESCDoesNotLeaveFullscreenWindow) { + MAYBE_ESCDoesNotLeaveFullscreenWindow) { // This test is flaky on MacOS 10.6. #if defined(OS_MACOSX) && !defined(OS_IOS) if (base::mac::IsOSSnowLeopard()) |