summaryrefslogtreecommitdiffstats
path: root/chrome/browser/unload_uitest.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-02 20:16:35 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-02 20:16:35 +0000
commitf0005166bd10f377f379fb392b09510c248e9b86 (patch)
treed3834e39a4aa572a276a2335b0f578a3f2424710 /chrome/browser/unload_uitest.cc
parent275ee65acf5e0051c46bde2b23a62fcf6c8a9c42 (diff)
downloadchromium_src-f0005166bd10f377f379fb392b09510c248e9b86.zip
chromium_src-f0005166bd10f377f379fb392b09510c248e9b86.tar.gz
chromium_src-f0005166bd10f377f379fb392b09510c248e9b86.tar.bz2
Mark a test as flaky on linux because it fails sometimes on valgrind.
BUG=32615,45675 TEST=tree greener TBR=creis Review URL: http://codereview.chromium.org/2450006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/unload_uitest.cc')
-rw-r--r--chrome/browser/unload_uitest.cc17
1 files changed, 11 insertions, 6 deletions
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc
index 60b2913..cd5d837 100644
--- a/chrome/browser/unload_uitest.cc
+++ b/chrome/browser/unload_uitest.cc
@@ -287,15 +287,20 @@ TEST_F(UnloadTest, BrowserCloseUnload) {
#if defined(OS_MACOSX)
// ClickModalDialogButton doesn't work on Mac: http://crbug.com/45031
-#define BrowserCloseBeforeUnloadOK DISABLED_BrowserCloseBeforeUnloadOK
-#define BrowserCloseBeforeUnloadCancel DISABLED_BrowserCloseBeforeUnloadCancel
-#define BrowserCloseWithInnerFocusedFrame \
+#define MAYBE_BrowserCloseBeforeUnloadOK DISABLED_BrowserCloseBeforeUnloadOK
+#define MAYBE_BrowserCloseBeforeUnloadCancel \
+ DISABLED_BrowserCloseBeforeUnloadCancel
+#define MAYBE_BrowserCloseWithInnerFocusedFrame \
DISABLED_BrowserCloseWithInnerFocusedFrame
+#elif defined(OS_LINUX)
+// Fails sometimes on Linux valgrind.
+#define MAYBE_BrowserCloseWithInnerFocusedFrame \
+ FLAKY_BrowserCloseWithInnerFocusedFrame
#endif
// Tests closing the browser with a beforeunload handler and clicking
// OK in the beforeunload confirm dialog.
-TEST_F(UnloadTest, BrowserCloseBeforeUnloadOK) {
+TEST_F(UnloadTest, MAYBE_BrowserCloseBeforeUnloadOK) {
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser.get());
NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload");
@@ -307,7 +312,7 @@ TEST_F(UnloadTest, BrowserCloseBeforeUnloadOK) {
// Tests closing the browser with a beforeunload handler and clicking
// CANCEL in the beforeunload confirm dialog.
-TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) {
+TEST_F(UnloadTest, MAYBE_BrowserCloseBeforeUnloadCancel) {
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser.get());
NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload");
@@ -326,7 +331,7 @@ TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) {
// Tests closing the browser and clicking OK in the beforeunload confirm dialog
// if an inner frame has the focus. See crbug.com/32615.
-TEST_F(UnloadTest, BrowserCloseWithInnerFocusedFrame) {
+TEST_F(UnloadTest, MAYBE_BrowserCloseWithInnerFocusedFrame) {
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser.get());