diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 03:02:19 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 03:02:19 +0000 |
| commit | 45c6f672d6c3a058b5724e68dec1b641c33e3417 (patch) | |
| tree | d80caea671bba3940ae0498e28afa5210dd4439c /chrome/browser/notifications | |
| parent | 897d236ca24e9cd09b8d39ae4c67bf4c27a86bc0 (diff) | |
| download | chromium_src-45c6f672d6c3a058b5724e68dec1b641c33e3417.zip chromium_src-45c6f672d6c3a058b5724e68dec1b641c33e3417.tar.gz chromium_src-45c6f672d6c3a058b5724e68dec1b641c33e3417.tar.bz2 | |
Another batch of disabled Ash browser tests
Ran the tests locally and disabled all failing tests (still too many timeouts to actually get through all the tests -- browser tests quit after 5+ tiemouts I think...)... will do another pass.
Temporarily disabled tests are tracked @ https://docs.google.com/a/google.com/document/d/110YdKCAj3MxECZcW3iwYLjgTdzs2aZicLeA8OrC20Zo/edit
BUG=179830, 262796
Review URL: https://chromiumcodereview.appspot.com/19786007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213035 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications')
| -rw-r--r-- | chrome/browser/notifications/message_center_notifications_browsertest.cc | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/chrome/browser/notifications/message_center_notifications_browsertest.cc b/chrome/browser/notifications/message_center_notifications_browsertest.cc index bb1d42c..455f514 100644 --- a/chrome/browser/notifications/message_center_notifications_browsertest.cc +++ b/chrome/browser/notifications/message_center_notifications_browsertest.cc @@ -21,6 +21,10 @@ #include "ui/message_center/message_center_switches.h" #include "ui/message_center/message_center_util.h" +#if defined(OS_WIN) && defined(USE_ASH) +#include "base/win/windows_version.h" +#endif + class TestAddObserver : public message_center::MessageCenterObserver { public: TestAddObserver(const std::string& id, @@ -177,6 +181,12 @@ IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest, MAYBE_BasicAddCancel) { #endif IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest, MAYBE_BasicDelegate) { +#if defined(OS_WIN) && defined(USE_ASH) + // Disable this test in Metro+Ash for now (http://crbug.com/262796). + if (base::win::GetVersion() >= base::win::VERSION_WIN8) + return; +#endif + EXPECT_TRUE(NotificationUIManager::DelegatesToMessageCenter()); TestDelegate* delegate; manager()->Add(CreateTestNotification("hey", &delegate), profile()); @@ -197,6 +207,12 @@ IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest, MAYBE_BasicDelegate) { IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest, MAYBE_ButtonClickedDelegate) { +#if defined(OS_WIN) && defined(USE_ASH) + // Disable this test in Metro+Ash for now (http://crbug.com/262796). + if (base::win::GetVersion() >= base::win::VERSION_WIN8) + return; +#endif + EXPECT_TRUE(NotificationUIManager::DelegatesToMessageCenter()); TestDelegate* delegate; manager()->Add(CreateTestNotification("n", &delegate), profile()); @@ -215,6 +231,12 @@ IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest, IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest, MAYBE_UpdateExistingNotification) { +#if defined(OS_WIN) && defined(USE_ASH) + // Disable this test in Metro+Ash for now (http://crbug.com/262796). + if (base::win::GetVersion() >= base::win::VERSION_WIN8) + return; +#endif + EXPECT_TRUE(NotificationUIManager::DelegatesToMessageCenter()); TestDelegate* delegate; manager()->Add(CreateTestNotification("n", &delegate), profile()); |