diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 20:00:16 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 20:00:16 +0000 |
| commit | 5c159171b8cf439b43c42908ec158cef83889eca (patch) | |
| tree | 8b1accb17dc8da79332b23cc76549404c33fd9c1 | |
| parent | ad15e527d974aa222677e2ebe80b320ba0fd4803 (diff) | |
| download | chromium_src-5c159171b8cf439b43c42908ec158cef83889eca.zip chromium_src-5c159171b8cf439b43c42908ec158cef83889eca.tar.gz chromium_src-5c159171b8cf439b43c42908ec158cef83889eca.tar.bz2 | |
Disable ClosingLastTabFinishesUnload and WindowCloseFinishesUnload on Mac/Linux
R=thakis@chromium.org
BUG=301173
Review URL: https://codereview.chromium.org/26355004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227978 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/unload_browsertest.cc | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc index e6f1a78..2d4917e 100644 --- a/chrome/browser/unload_browsertest.cc +++ b/chrome/browser/unload_browsertest.cc @@ -535,13 +535,8 @@ IN_PROC_BROWSER_TEST_F(FastUnloadTest, PRE_ClosingLastTabFinishesUnload) { window_observer.Wait(); } -// Fails on Mac 64 bots (http://crbug.com/301173). -#if defined(OS_MACOSX) && ARCH_CPU_64_BITS -#define MAYBE_ClosingLastTabFinishesUnload DISABLED_ClosingLastTabFinishesUnload -#else -#define MAYBE_ClosingLastTabFinishesUnload ClosingLastTabFinishesUnload -#endif -IN_PROC_BROWSER_TEST_F(FastUnloadTest, MAYBE_ClosingLastTabFinishesUnload) { +// Fails on Mac, Linux, Win7 (http://crbug.com/301173). +IN_PROC_BROWSER_TEST_F(FastUnloadTest, DISABLED_ClosingLastTabFinishesUnload) { #if defined(OS_WIN) // Flaky on Win7+ bots (http://crbug.com/267597). if (base::win::GetVersion() >= base::win::VERSION_WIN7) @@ -571,14 +566,9 @@ IN_PROC_BROWSER_TEST_F(FastUnloadTest, PRE_WindowCloseFinishesUnload) { window_observer.Wait(); } -// Flaky on Windows bots (http://crbug.com/279267) and fails on Mac 64 bots +// Flaky on Windows bots (http://crbug.com/279267) and fails on Mac / Linux bots // (http://crbug.com/301173). -#if defined(OS_WIN) || (defined(OS_MACOSX) && ARCH_CPU_64_BITS) -#define MAYBE_WindowCloseFinishesUnload DISABLED_WindowCloseFinishesUnload -#else -#define MAYBE_WindowCloseFinishesUnload WindowCloseFinishesUnload -#endif -IN_PROC_BROWSER_TEST_F(FastUnloadTest, MAYBE_WindowCloseFinishesUnload) { +IN_PROC_BROWSER_TEST_F(FastUnloadTest, DISABLED_WindowCloseFinishesUnload) { // Check for cookie set in unload during PRE_ test. NavigateToPage("no_listeners"); EXPECT_EQ("unloaded=ohyeah", GetCookies("no_listeners")); |