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

Unified Diff: ash/common/system/tray/system_tray_unittest.cc

Issue 2249883002: Disable BubbleCreationTypesTest on Windows and Chrome OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/system_tray_unittest.cc
diff --git a/ash/common/system/tray/system_tray_unittest.cc b/ash/common/system/tray/system_tray_unittest.cc
index abc9d053506c48121dbf81babc8aa9283ea61b75..4a9dcc0fbae9e8e36d538e7191f1e1eff68cd268 100644
--- a/ash/common/system/tray/system_tray_unittest.cc
+++ b/ash/common/system/tray/system_tray_unittest.cc
@@ -357,7 +357,13 @@ TEST_F(SystemTrayTest, SystemTrayNotifications) {
ASSERT_TRUE(test_item->notification_view() != NULL);
}
-TEST_F(SystemTrayTest, BubbleCreationTypesTest) {
+// Test is flaky on Win7 and Cros (crbug.com/637978).
+#if defined(OS_CHROMEOS) || defined(OS_WIN)
+#define MAYBE_BubbleCreationTypesTest DISABLED_BubbleCreationTypesTest
+#else
+#define MAYBE_BubbleCreationTypesTest BubbleCreationTypesTest
+#endif
+TEST_F(SystemTrayTest, MAYBE_BubbleCreationTypesTest) {
SystemTray* tray = GetPrimarySystemTray();
ASSERT_TRUE(tray->GetWidget());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698