summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-16 15:26:16 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-16 15:26:16 +0000
commit471d7d6e2b01a55e1166ddec17731790166a9316 (patch)
tree82ac13d82bd37ae07d024eef5ae5ee8b336a0ba7 /base
parent5f57fd97af66ab068969a7d3fe4c7cb9f446f2ec (diff)
downloadchromium_src-471d7d6e2b01a55e1166ddec17731790166a9316.zip
chromium_src-471d7d6e2b01a55e1166ddec17731790166a9316.tar.gz
chromium_src-471d7d6e2b01a55e1166ddec17731790166a9316.tar.bz2
Mark some disabled tests as flaky to increase test coverage.
When a test doesn't hang or crash, it can run on the bots and on developers' machines. BUG=none TEST=none Review URL: http://codereview.chromium.org/269104 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/condition_variable_unittest.cc4
-rw-r--r--base/timer_unittest.cc5
2 files changed, 4 insertions, 5 deletions
diff --git a/base/condition_variable_unittest.cc b/base/condition_variable_unittest.cc
index 345d141..95756e0 100644
--- a/base/condition_variable_unittest.cc
+++ b/base/condition_variable_unittest.cc
@@ -184,8 +184,8 @@ TEST_F(ConditionVariableTest, TimeoutTest) {
}
// Test serial task servicing, as well as two parallel task servicing methods.
-// TODO(maruel): http://crbug.com/10607
-TEST_F(ConditionVariableTest, DISABLED_MultiThreadConsumerTest) {
+// TODO(maruel): This test is flaky, see http://crbug.com/10607
+TEST_F(ConditionVariableTest, FLAKY_MultiThreadConsumerTest) {
const int kThreadCount = 10;
WorkQueue queue(kThreadCount); // Start the threads.
diff --git a/base/timer_unittest.cc b/base/timer_unittest.cc
index 74c6a66..8c18947 100644
--- a/base/timer_unittest.cc
+++ b/base/timer_unittest.cc
@@ -318,9 +318,8 @@ TEST(TimerTest, DelayTimer_OneCall) {
RunTest_DelayTimer_OneCall(MessageLoop::TYPE_IO);
}
-// 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) {
+// It's flaky on the buildbot, http://crbug.com/25038.
+TEST(TimerTest, FLAKY_DelayTimer_Reset) {
RunTest_DelayTimer_Reset(MessageLoop::TYPE_DEFAULT);
RunTest_DelayTimer_Reset(MessageLoop::TYPE_UI);
RunTest_DelayTimer_Reset(MessageLoop::TYPE_IO);