summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-02 00:44:36 +0000
committerrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-02 00:44:36 +0000
commit590e4a017739db4d784452d39787f32662e4d2b8 (patch)
tree6bf001c05e13d124f27e4bd03a7d5182a921d609
parentfafa55e4008334d46aaa744b7064247bf60b2fb6 (diff)
downloadchromium_src-590e4a017739db4d784452d39787f32662e4d2b8.zip
chromium_src-590e4a017739db4d784452d39787f32662e4d2b8.tar.gz
chromium_src-590e4a017739db4d784452d39787f32662e4d2b8.tar.bz2
Disable BrowserTest.FLAKY_SingleBeforeUnloadAfterWindowClose on mac. It is crashy.
BUG=40150 TEST=No crashy. Review URL: http://codereview.chromium.org/1545015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43420 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser_browsertest.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index a73d1b5..66922f5 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -259,10 +259,19 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ReloadThenCancelBeforeUnload) {
ExecuteJavascriptInWebFrame(L"", L"onbeforeunload=null;");
}
+// Crashy on mac. http://crbug.com/40150
+#if defined(OS_MACOSX)
+#define MAYBE_SingleBeforeUnloadAfterWindowClose \
+ DISABLED_SingleBeforeUnloadAfterWindowClose
+#else
+#define MAYBE_SingleBeforeUnloadAfterWindowClose \
+ FLAKY_SingleBeforeUnloadAfterWindowClose
+#endif
+
// Test for crbug.com/11647. A page closed with window.close() should not have
// two beforeunload dialogs shown.
// Flaky: see http://crbug.com/27039
-IN_PROC_BROWSER_TEST_F(BrowserTest, FLAKY_SingleBeforeUnloadAfterWindowClose) {
+IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_SingleBeforeUnloadAfterWindowClose) {
browser()->GetSelectedTabContents()->render_view_host()->
ExecuteJavascriptInWebFrame(L"", OPEN_NEW_BEFOREUNLOAD_PAGE);