summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-09 19:54:16 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-09 19:54:16 +0000
commit7d877681807ae7802634464a4f61717970733de2 (patch)
tree581a76004aa6203e046fbf350ef4c877b464e467 /base
parent2879092e01ea4ebb93c1b80925c81e059b24607b (diff)
downloadchromium_src-7d877681807ae7802634464a4f61717970733de2.zip
chromium_src-7d877681807ae7802634464a4f61717970733de2.tar.gz
chromium_src-7d877681807ae7802634464a4f61717970733de2.tar.bz2
Disable flaky TimerTest.DelayTimer_Reset test.
Not filing a bug because timer test are difficult to make not-flaky on the buildbots. However, added comments to the code so that people who touch this area remember to run all tests. Review URL: http://codereview.chromium.org/40312 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/timer.h5
-rw-r--r--base/timer_unittest.cc4
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);