summaryrefslogtreecommitdiffstats
path: root/ash/system
diff options
context:
space:
mode:
authorstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-15 21:02:50 +0000
committerstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-15 21:02:50 +0000
commit47db164c5a624e92f1da9bb345485e258c0184eb (patch)
treeeb0aaca188117cbe59ac41a171e0e88d31fd886c /ash/system
parent6afb0e81d1eccd19864a6462d3a505471e141294 (diff)
downloadchromium_src-47db164c5a624e92f1da9bb345485e258c0184eb.zip
chromium_src-47db164c5a624e92f1da9bb345485e258c0184eb.tar.gz
chromium_src-47db164c5a624e92f1da9bb345485e258c0184eb.tar.bz2
Disable SystemTray BubbleCreationTypesTest on OS_WIN
BUG=127539 TEST=aura_shell_unittests pass on win_aura TBR=sadrul Review URL: https://chromiumcodereview.appspot.com/10566010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142476 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
-rw-r--r--ash/system/tray/system_tray_unittest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc
index 9bbb801..6ba8f0e 100644
--- a/ash/system/tray/system_tray_unittest.cc
+++ b/ash/system/tray/system_tray_unittest.cc
@@ -202,7 +202,14 @@ TEST_F(SystemTrayTest, DISABLED_SystemTrayNotifications) {
ASSERT_TRUE(test_item->notification_view() != NULL);
}
-TEST_F(SystemTrayTest, BubbleCreationTypesTest) {
+#if defined(OS_WIN)
+// This test is crashing on windows. See http://crbug.com/127539.
+#define MAYBE_BubbleCreationTypesTest DISABLED_BubbleCreationTypesTest
+#else
+#define MAYBE_BubbleCreationTypesTest BubbleCreationTypesTest
+#endif
+
+TEST_F(SystemTrayTest, MAYBE_BubbleCreationTypesTest) {
SystemTray* tray = GetSystemTray();
ASSERT_TRUE(tray->GetWidget());