summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 08:43:26 +0000
committertyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 08:43:26 +0000
commitdcafe8d8668f740d66e4d932684cda934339d980 (patch)
treede6b1ffec4600b2801aa7e34e2d60f05f2ecb82b
parent6cf2ada64736205f1d28fc13abe1accdb5091b5f (diff)
downloadchromium_src-dcafe8d8668f740d66e4d932684cda934339d980.zip
chromium_src-dcafe8d8668f740d66e4d932684cda934339d980.tar.gz
chromium_src-dcafe8d8668f740d66e4d932684cda934339d980.tar.bz2
Disable flaky test NotificationsTest.TestCrashRendererNotificationRemain
TBR=dewittj BUG=248470 Review URL: https://codereview.chromium.org/16652012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205473 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/notifications/notification_browsertest.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc
index 3a673a0..06fe062 100644
--- a/chrome/browser/notifications/notification_browsertest.cc
+++ b/chrome/browser/notifications/notification_browsertest.cc
@@ -905,7 +905,17 @@ IN_PROC_BROWSER_TEST_F(
ASSERT_EQ(1, GetNotificationCount());
}
-IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCrashRendererNotificationRemain) {
+// See crbug.com/248470
+#if defined(OS_LINUX)
+#define MAYBE_TestCrashRendererNotificationRemain \
+ DISABLED_TestCrashRendererNotificationRemain
+#else
+#define MAYBE_TestCrashRendererNotificationRemain \
+ TestCrashRendererNotificationRemain
+#endif
+
+IN_PROC_BROWSER_TEST_F(NotificationsTest,
+ MAYBE_TestCrashRendererNotificationRemain) {
#if defined(OS_MACOSX)
// TODO(kbr): re-enable: http://crbug.com/222296
if (base::mac::IsOSMountainLionOrLater())