summaryrefslogtreecommitdiffstats
path: root/chrome/browser/unload_uitest.cc
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-29 17:16:34 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-29 17:16:34 +0000
commit19bb2ccd190d30d2ec9b8288601c44eee841bff5 (patch)
tree37dc15a739f7c71e1f2efd839f0d08a500c906c2 /chrome/browser/unload_uitest.cc
parent42504bc2146aa7fd3fce3a8438dff84cd193ea43 (diff)
downloadchromium_src-19bb2ccd190d30d2ec9b8288601c44eee841bff5.zip
chromium_src-19bb2ccd190d30d2ec9b8288601c44eee841bff5.tar.gz
chromium_src-19bb2ccd190d30d2ec9b8288601c44eee841bff5.tar.bz2
Disable another crashing unload test on Linux
TBR=erikkay BUG=47575 TEST=Greener bots Review URL: http://codereview.chromium.org/2887001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/unload_uitest.cc')
-rw-r--r--chrome/browser/unload_uitest.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc
index 7ac6507..04f2b5f 100644
--- a/chrome/browser/unload_uitest.cc
+++ b/chrome/browser/unload_uitest.cc
@@ -20,9 +20,13 @@
#define MAYBE_BrowserCloseNoUnloadListeners \
DISABLED_BrowserCloseNoUnloadListeners
#define MAYBE_BrowserCloseUnload DISABLED_BrowserCloseUnload
+#define MAYBE_BrowserCloseTwoSecondBeforeUnload \
+ DISABLED_BrowserCloseTwoSecondBeforeUnload
#else
#define MAYBE_BrowserCloseNoUnloadListeners BrowserCloseNoUnloadListeners
#define MAYBE_BrowserCloseUnload BrowserCloseUnload
+#define MAYBE_BrowserCloseTwoSecondBeforeUnload \
+ BrowserCloseTwoSecondBeforeUnload
#endif
const std::string NOLISTENERS_HTML =
@@ -345,7 +349,7 @@ TEST_F(UnloadTest, MAYBE_BrowserCloseWithInnerFocusedFrame) {
// Tests closing the browser with a beforeunload handler that takes
// two seconds to run.
-TEST_F(UnloadTest, BrowserCloseTwoSecondBeforeUnload) {
+TEST_F(UnloadTest, MAYBE_BrowserCloseTwoSecondBeforeUnload) {
LoadUrlAndQuitBrowser(TWO_SECOND_BEFORE_UNLOAD_HTML,
L"twosecondbeforeunload");
}