diff options
| -rw-r--r-- | base/timer.h | 5 | ||||
| -rw-r--r-- | base/timer_unittest.cc | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/base/timer.h b/base/timer.h index dcabefa..08c851f 100644 --- a/base/timer.h +++ b/base/timer.h @@ -41,6 +41,11 @@ #ifndef BASE_TIMER_H_ #define BASE_TIMER_H_ +// IMPORTANT: If you change timer code, make sure that all tests (including +// disabled ones) from timer_unittests.cc pass locally. Some are disabled +// because they're flaky on the buildbot, but when you run them locally you +// should be able to tell the difference. + #include "base/task.h" #include "base/time.h" diff --git a/base/timer_unittest.cc b/base/timer_unittest.cc index 665a066..74c6a66 100644 --- a/base/timer_unittest.cc +++ b/base/timer_unittest.cc @@ -318,7 +318,9 @@ TEST(TimerTest, DelayTimer_OneCall) { RunTest_DelayTimer_OneCall(MessageLoop::TYPE_IO); } -TEST(TimerTest, DelayTimer_Reset) { +// Disabled because it's flaky on the buildbot. Bug not filed because this +// kind of test is difficult to make not-flaky on buildbots. +TEST(TimerTest, DISABLED_DelayTimer_Reset) { RunTest_DelayTimer_Reset(MessageLoop::TYPE_DEFAULT); RunTest_DelayTimer_Reset(MessageLoop::TYPE_UI); RunTest_DelayTimer_Reset(MessageLoop::TYPE_IO); |