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

Unified Diff: device/battery/battery_status_service_unittest.cc

Issue 699823002: Disable three BatteryStatusServiceTests on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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: device/battery/battery_status_service_unittest.cc
diff --git a/device/battery/battery_status_service_unittest.cc b/device/battery/battery_status_service_unittest.cc
index f286c9fc9efbc5dd425fb03418cc975a3b64f90f..d249d570ef1c6ad4c53652c5b2a70770bba708f0 100644
--- a/device/battery/battery_status_service_unittest.cc
+++ b/device/battery/battery_status_service_unittest.cc
@@ -139,7 +139,13 @@ TEST_F(BatteryStatusServiceTest, AddFirstCallback) {
EXPECT_EQ(1, battery_manager()->stop_invoked_count());
}
-TEST_F(BatteryStatusServiceTest, AddCallbackAfterUpdate) {
+// Fails on Windows. http://crbug.com/429942.
+#if defined(OS_WIN)
+#define MAYBE_AddCallbackAfterUpdate DISABLED_AddCallbackAfterUpdate
+#else
+#define MAYBE_AddCallbackAfterUpdate AddCallbackAfterUpdate
+#endif
+TEST_F(BatteryStatusServiceTest, MAYBE_AddCallbackAfterUpdate) {
scoped_ptr<BatterySubscription> subscription1 = AddCallback(callback1());
BatteryStatus status;
battery_manager()->InvokeUpdateCallback(status);
@@ -152,7 +158,13 @@ TEST_F(BatteryStatusServiceTest, AddCallbackAfterUpdate) {
EXPECT_EQ(1, callback2_invoked_count());
}
-TEST_F(BatteryStatusServiceTest, TwoCallbacksUpdate) {
+// Fails on Windows. http://crbug.com/429942.
+#if defined(OS_WIN)
+#define MAYBE_TwoCallbacksUpdate DISABLED_TwoCallbacksUpdate
+#else
+#define MAYBE_TwoCallbacksUpdate TwoCallbacksUpdate
+#endif
+TEST_F(BatteryStatusServiceTest, MAYBE_TwoCallbacksUpdate) {
scoped_ptr<BatterySubscription> subscription1 = AddCallback(callback1());
scoped_ptr<BatterySubscription> subscription2 = AddCallback(callback2());
@@ -172,7 +184,13 @@ TEST_F(BatteryStatusServiceTest, TwoCallbacksUpdate) {
EXPECT_EQ(status.level, battery_status().level);
}
-TEST_F(BatteryStatusServiceTest, RemoveOneCallback) {
+// Fails on Windows. http://crbug.com/429942.
+#if defined(OS_WIN)
+#define MAYBE_RemoveOneCallback DISABLED_RemoveOneCallback
+#else
+#define MAYBE_RemoveOneCallback RemoveOneCallback
+#endif
+TEST_F(BatteryStatusServiceTest, MAYBE_RemoveOneCallback) {
scoped_ptr<BatterySubscription> subscription1 = AddCallback(callback1());
scoped_ptr<BatterySubscription> subscription2 = AddCallback(callback2());
« 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