diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 21:24:34 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 21:24:34 +0000 |
| commit | a362e1599a9836c754f5e308079942ec7ebfb30b (patch) | |
| tree | b7ab4d87572ef5d0f5d63fcedb7b9dd9ed26342d /chrome/browser/sync | |
| parent | 39cf828f3fd0c98b53f155f12418e69481c9ef0d (diff) | |
| download | chromium_src-a362e1599a9836c754f5e308079942ec7ebfb30b.zip chromium_src-a362e1599a9836c754f5e308079942ec7ebfb30b.tar.gz chromium_src-a362e1599a9836c754f5e308079942ec7ebfb30b.tar.bz2 | |
sync: fix a couple less-than comparisons to be less-than-eq in tests.
TBR=akalin
BUG=26339
TEST=SyncerThread2Test
Review URL: http://codereview.chromium.org/6267015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/engine/syncer_thread2_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/sync/engine/syncer_thread2_unittest.cc b/chrome/browser/sync/engine/syncer_thread2_unittest.cc index b0adecd..afacb99 100644 --- a/chrome/browser/sync/engine/syncer_thread2_unittest.cc +++ b/chrome/browser/sync/engine/syncer_thread2_unittest.cc @@ -88,7 +88,7 @@ class SyncerThread2Test : public testing::Test { SCOPED_TRACE(testing::Message() << "SyncShare # (" << i << ")"); TimeTicks optimal_next_sync = optimal_start + poll_interval * i; EXPECT_GE(data[i], optimal_next_sync); - EXPECT_LT(data[i], optimal_next_sync + poll_interval); + EXPECT_LE(data[i], optimal_next_sync + poll_interval); EXPECT_EQ(GetUpdatesCallerInfo::PERIODIC, records.snapshots[i]->source.first); } @@ -502,6 +502,7 @@ TEST_F(SyncerThread2Test, BackoffRelief) { TimeTicks optimal_start = TimeTicks::Now() + poll + backoff; syncer_thread()->Start(SyncerThread::NORMAL_MODE); done.TimedWait(timeout()); + syncer_thread()->Stop(); // Check for healthy polling after backoff is relieved. // Can't use AnalyzePollRun because first sync is a continuation. Bleh. @@ -509,7 +510,7 @@ TEST_F(SyncerThread2Test, BackoffRelief) { SCOPED_TRACE(testing::Message() << "SyncShare # (" << i << ")"); TimeTicks optimal_next_sync = optimal_start + poll * i; EXPECT_GE(r.times[i], optimal_next_sync); - EXPECT_LT(r.times[i], optimal_next_sync + poll); + EXPECT_LE(r.times[i], optimal_next_sync + poll); EXPECT_EQ(i == 0 ? GetUpdatesCallerInfo::SYNC_CYCLE_CONTINUATION : GetUpdatesCallerInfo::PERIODIC, r.snapshots[i]->source.first); |