diff options
| author | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-05 20:52:52 +0000 |
|---|---|---|
| committer | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-05 20:52:52 +0000 |
| commit | 1e9380e4aa806f1ab03cc18c6085137076d95276 (patch) | |
| tree | a279b4b9c524667c3f1f920166b31acac292eea8 /base/watchdog_unittest.cc | |
| parent | f8edbfe65440706c0508b634f3ccc7b146ee7348 (diff) | |
| download | chromium_src-1e9380e4aa806f1ab03cc18c6085137076d95276.zip chromium_src-1e9380e4aa806f1ab03cc18c6085137076d95276.tar.gz chromium_src-1e9380e4aa806f1ab03cc18c6085137076d95276.tar.bz2 | |
Watchdog test is flaky, try relaxing timeout.
(2nd try at getting a review, this time with nsylvain.)
Review URL: http://codereview.chromium.org/16474
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7558 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/watchdog_unittest.cc')
| -rw-r--r-- | base/watchdog_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/watchdog_unittest.cc b/base/watchdog_unittest.cc index 887311a..00e82e3 100644 --- a/base/watchdog_unittest.cc +++ b/base/watchdog_unittest.cc @@ -80,7 +80,8 @@ TEST(WatchdogTest, AlarmTest) { // Set a time greater than the timeout into the past. watchdog.ArmSomeTimeDeltaAgo(TimeDelta::FromSeconds(2)); // It should instantly go off, but certainly in less than a second. - SPIN_FOR_TIMEDELTA_OR_UNTIL_TRUE(TimeDelta::FromSeconds(1), + // In practice, on our trybots, it sometimes takes a little longer! + SPIN_FOR_TIMEDELTA_OR_UNTIL_TRUE(TimeDelta::FromMilliseconds(1500), watchdog.alarm_counter() > 1); EXPECT_EQ(2, watchdog.alarm_counter()); |