Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(799)

Unified Diff: chrome/browser/notifications/notification_browsertest.cc

Issue 12794013: Temporarily disabled tests failing on 10.8, when running on 10.8. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/notifications/notification_browsertest.cc
diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc
index 5fef1b297707568641fbfdfad94f44b5a642c312..95b6f05eacdf6e70061621ca446fc6c361bcde6c 100644
--- a/chrome/browser/notifications/notification_browsertest.cc
+++ b/chrome/browser/notifications/notification_browsertest.cc
@@ -8,6 +8,9 @@
#include "base/bind.h"
#include "base/callback.h"
#include "base/compiler_specific.h"
+#if defined(OS_MACOSX)
+#import "base/mac/mac_util.h"
+#endif
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/stringprintf.h"
@@ -500,6 +503,12 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNoUserGestureInfobar) {
#if !defined(OS_CHROMEOS)
IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCreateSimpleNotification) {
+#if defined(OS_MACOSX)
+ // TODO(kbr): re-enable: http://crbug.com/222296
+ if (base::mac::IsOSMountainLionOrLater())
+ return;
+#endif
+
// Creates a simple notification.
AllowAllOrigins();
ui_test_utils::NavigateToURL(browser(), test_page_url_);
@@ -528,6 +537,12 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCreateSimpleNotification) {
}
IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCloseNotification) {
+#if defined(OS_MACOSX)
+ // TODO(kbr): re-enable: http://crbug.com/222296
+ if (base::mac::IsOSMountainLionOrLater())
+ return;
+#endif
+
// Creates a notification and closes it.
AllowAllOrigins();
ui_test_utils::NavigateToURL(browser(), test_page_url_);
@@ -553,6 +568,12 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCloseNotification) {
}
IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCancelNotification) {
+#if defined(OS_MACOSX)
+ // TODO(kbr): re-enable: http://crbug.com/222296
+ if (base::mac::IsOSMountainLionOrLater())
+ return;
+#endif
+
// Creates a notification and cancels it in the origin page.
AllowAllOrigins();
ui_test_utils::NavigateToURL(browser(), test_page_url_);
@@ -575,6 +596,12 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestPermissionInfobarAppears) {
}
IN_PROC_BROWSER_TEST_F(NotificationsTest, TestAllowOnPermissionInfobar) {
+#if defined(OS_MACOSX)
+ // TODO(kbr): re-enable: http://crbug.com/222296
+ if (base::mac::IsOSMountainLionOrLater())
+ return;
+#endif
+
// Tries to create a notification and clicks allow on the infobar.
ui_test_utils::NavigateToURL(browser(), test_page_url_);
// This notification should not be shown because we do not have permission.

Powered by Google App Engine
This is Rietveld 408576698