| Index: components/sync/engine_impl/sync_scheduler_impl_unittest.cc
|
| diff --git a/components/sync/engine_impl/sync_scheduler_impl_unittest.cc b/components/sync/engine_impl/sync_scheduler_impl_unittest.cc
|
| index 061eb7aea098798b1940acab5152866a6b8935ac..6e913f6f98389427469cbea14e084cfaac34aa58 100644
|
| --- a/components/sync/engine_impl/sync_scheduler_impl_unittest.cc
|
| +++ b/components/sync/engine_impl/sync_scheduler_impl_unittest.cc
|
| @@ -169,6 +169,7 @@ class SyncSchedulerImplTest : public testing::Test {
|
| MockDelayProvider* delay() { return delay_; }
|
| MockConnectionManager* connection() { return connection_.get(); }
|
| TimeDelta default_delay() { return TimeDelta::FromSeconds(0); }
|
| + TimeDelta long_delay() { return TimeDelta::FromSeconds(60); }
|
| TimeDelta timeout() { return TestTimeouts::action_timeout(); }
|
|
|
| void TearDown() override {
|
| @@ -229,6 +230,18 @@ class SyncSchedulerImplTest : public testing::Test {
|
| return scheduler_->nudge_tracker_.GetThrottledTypes();
|
| }
|
|
|
| + ModelTypeSet GetBackedOffTypes() {
|
| + return scheduler_->nudge_tracker_.GetBackedOffTypes();
|
| + }
|
| +
|
| + bool IsAnyTypeThrottled() {
|
| + return scheduler_->nudge_tracker_.IsAnyTypeThrottled();
|
| + }
|
| +
|
| + bool IsAnyTypeBackedOff() {
|
| + return scheduler_->nudge_tracker_.IsAnyTypeBackedOff();
|
| + }
|
| +
|
| base::TimeDelta GetRetryTimerDelay() {
|
| EXPECT_TRUE(scheduler_->retry_timer_.IsRunning());
|
| return scheduler_->retry_timer_.GetCurrentDelay();
|
| @@ -805,9 +818,6 @@ TEST_F(SyncSchedulerImplTest, ThrottlingExpiresFromConfigure) {
|
| }
|
|
|
| TEST_F(SyncSchedulerImplTest, TypeThrottlingBlocksNudge) {
|
| - UseMockDelayProvider();
|
| - EXPECT_CALL(*delay(), GetDelay(_)).WillRepeatedly(Return(default_delay()));
|
| -
|
| TimeDelta poll(TimeDelta::FromDays(1));
|
| TimeDelta throttle1(TimeDelta::FromSeconds(60));
|
| scheduler()->OnReceivedLongPollIntervalUpdate(poll);
|
| @@ -826,6 +836,8 @@ TEST_F(SyncSchedulerImplTest, TypeThrottlingBlocksNudge) {
|
| PumpLoop(); // To get PerformDelayedNudge called.
|
| PumpLoop(); // To get TrySyncCycleJob called
|
| EXPECT_TRUE(GetThrottledTypes().HasAll(types));
|
| + EXPECT_FALSE(scheduler()->IsBackingOff());
|
| + EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
|
|
|
| // This won't cause a sync cycle because the types are throttled.
|
| scheduler()->ScheduleLocalNudge(types, FROM_HERE);
|
| @@ -834,6 +846,165 @@ TEST_F(SyncSchedulerImplTest, TypeThrottlingBlocksNudge) {
|
| StopSyncScheduler();
|
| }
|
|
|
| +TEST_F(SyncSchedulerImplTest, TypeBackingOffBlocksNudge) {
|
| + UseMockDelayProvider();
|
| + EXPECT_CALL(*delay(), GetDelay(_)).WillRepeatedly(Return(long_delay()));
|
| +
|
| + TimeDelta poll(TimeDelta::FromDays(1));
|
| + scheduler()->OnReceivedLongPollIntervalUpdate(poll);
|
| +
|
| + const ModelTypeSet types(THEMES);
|
| +
|
| + ::testing::InSequence seq;
|
| + EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
|
| + .WillOnce(DoAll(WithArg<2>(test_util::SimulatePartialFailure(types)),
|
| + Return(false)))
|
| + .RetiresOnSaturation();
|
| +
|
| + StartSyncScheduler(base::Time());
|
| + scheduler()->ScheduleLocalNudge(types, FROM_HERE);
|
| + PumpLoop(); // To get PerformDelayedNudge called.
|
| + PumpLoop(); // To get TrySyncCycleJob called
|
| + EXPECT_TRUE(GetBackedOffTypes().HasAll(types));
|
| + EXPECT_FALSE(scheduler()->IsBackingOff());
|
| + EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
|
| +
|
| + // This won't cause a sync cycle because the types are backed off.
|
| + scheduler()->ScheduleLocalNudge(types, FROM_HERE);
|
| + PumpLoop();
|
| +
|
| + StopSyncScheduler();
|
| +}
|
| +
|
| +TEST_F(SyncSchedulerImplTest, TypeBackingOffWillExpire) {
|
| + UseMockDelayProvider();
|
| + EXPECT_CALL(*delay(), GetDelay(_)).WillRepeatedly(Return(default_delay()));
|
| +
|
| + TimeDelta poll(TimeDelta::FromDays(1));
|
| + scheduler()->OnReceivedLongPollIntervalUpdate(poll);
|
| +
|
| + const ModelTypeSet types(THEMES);
|
| +
|
| + ::testing::InSequence seq;
|
| + EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
|
| + .WillOnce(DoAll(WithArg<2>(test_util::SimulatePartialFailure(types)),
|
| + Return(false)))
|
| + .RetiresOnSaturation();
|
| +
|
| + StartSyncScheduler(base::Time());
|
| + scheduler()->ScheduleLocalNudge(types, FROM_HERE);
|
| + PumpLoop(); // To get PerformDelayedNudge called.
|
| + PumpLoop(); // To get TrySyncCycleJob called
|
| + EXPECT_TRUE(GetBackedOffTypes().HasAll(types));
|
| + EXPECT_FALSE(scheduler()->IsBackingOff());
|
| + EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
|
| +
|
| + SyncShareTimes times;
|
| + EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
|
| + .WillRepeatedly(DoAll(Invoke(test_util::SimulateNormalSuccess),
|
| + RecordSyncShare(×, true)));
|
| + PumpLoop(); // To get PerformDelayedNudge called.
|
| + PumpLoop(); // To get TrySyncCycleJob called
|
| + EXPECT_FALSE(IsAnyTypeBackedOff());
|
| + EXPECT_FALSE(IsAnyTypeThrottled());
|
| + EXPECT_FALSE(scheduler()->IsBackingOff());
|
| + EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
|
| +
|
| + StopSyncScheduler();
|
| +}
|
| +
|
| +TEST_F(SyncSchedulerImplTest, TypeBackingOffAndThrottling) {
|
| + UseMockDelayProvider();
|
| + EXPECT_CALL(*delay(), GetDelay(_)).WillRepeatedly(Return(long_delay()));
|
| +
|
| + TimeDelta poll(TimeDelta::FromDays(1));
|
| + scheduler()->OnReceivedLongPollIntervalUpdate(poll);
|
| +
|
| + const ModelTypeSet types(THEMES);
|
| +
|
| + ::testing::InSequence seq;
|
| + EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
|
| + .WillOnce(DoAll(WithArg<2>(test_util::SimulatePartialFailure(types)),
|
| + Return(false)))
|
| + .RetiresOnSaturation();
|
| +
|
| + StartSyncScheduler(base::Time());
|
| + scheduler()->ScheduleLocalNudge(types, FROM_HERE);
|
| + PumpLoop(); // To get PerformDelayedNudge called.
|
| + PumpLoop(); // To get TrySyncCycleJob called
|
| + EXPECT_TRUE(GetBackedOffTypes().HasAll(types));
|
| + EXPECT_FALSE(scheduler()->IsBackingOff());
|
| + EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
|
| +
|
| + TimeDelta throttle1(TimeDelta::FromMilliseconds(150));
|
| +
|
| + EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
|
| + .WillOnce(DoAll(WithArg<2>(test_util::SimulateThrottled(throttle1)),
|
| + Return(false)))
|
| + .RetiresOnSaturation();
|
| +
|
| + // Sync still can throttle.
|
| + const ModelTypeSet unbacked_off_types(TYPED_URLS);
|
| + scheduler()->ScheduleLocalNudge(unbacked_off_types, FROM_HERE);
|
| + PumpLoop(); // TO get TypesUnblock called.
|
| + PumpLoop(); // To get TrySyncCycleJob called.
|
| +
|
| + EXPECT_TRUE(GetBackedOffTypes().HasAll(types));
|
| + EXPECT_FALSE(scheduler()->IsBackingOff());
|
| + EXPECT_TRUE(scheduler()->IsCurrentlyThrottled());
|
| +
|
| + StopSyncScheduler();
|
| +}
|
| +
|
| +TEST_F(SyncSchedulerImplTest, TypeThrottlingBackingOffBlocksNudge) {
|
| + UseMockDelayProvider();
|
| + EXPECT_CALL(*delay(), GetDelay(_)).WillRepeatedly(Return(long_delay()));
|
| +
|
| + TimeDelta poll(TimeDelta::FromDays(1));
|
| + TimeDelta throttle(TimeDelta::FromSeconds(60));
|
| + scheduler()->OnReceivedLongPollIntervalUpdate(poll);
|
| +
|
| + const ModelTypeSet throttled_types(THEMES);
|
| +
|
| + ::testing::InSequence seq;
|
| + EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
|
| + .WillOnce(DoAll(WithArg<2>(test_util::SimulateTypesThrottled(
|
| + throttled_types, throttle)),
|
| + Return(false)))
|
| + .RetiresOnSaturation();
|
| +
|
| + StartSyncScheduler(base::Time());
|
| + scheduler()->ScheduleLocalNudge(throttled_types, FROM_HERE);
|
| + PumpLoop(); // To get PerformDelayedNudge called.
|
| + PumpLoop(); // To get TrySyncCycleJob called
|
| +
|
| + const ModelTypeSet backed_off_types(TYPED_URLS);
|
| +
|
| + EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
|
| + .WillOnce(
|
| + DoAll(WithArg<2>(test_util::SimulatePartialFailure(backed_off_types)),
|
| + Return(false)))
|
| + .RetiresOnSaturation();
|
| +
|
| + scheduler()->ScheduleLocalNudge(backed_off_types, FROM_HERE);
|
| +
|
| + PumpLoop(); // To get PerformDelayedNudge called.
|
| + PumpLoop(); // To get TrySyncCycleJob called
|
| +
|
| + EXPECT_TRUE(GetThrottledTypes().HasAll(throttled_types));
|
| + EXPECT_TRUE(GetBackedOffTypes().HasAll(backed_off_types));
|
| + EXPECT_FALSE(scheduler()->IsBackingOff());
|
| + EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
|
| +
|
| + // This won't cause a sync cycle because the types are throttled or backed
|
| + // off.
|
| + scheduler()->ScheduleLocalNudge(Union(throttled_types, backed_off_types),
|
| + FROM_HERE);
|
| + PumpLoop();
|
| +
|
| + StopSyncScheduler();
|
| +}
|
| +
|
| TEST_F(SyncSchedulerImplTest, TypeThrottlingDoesBlockOtherSources) {
|
| UseMockDelayProvider();
|
| EXPECT_CALL(*delay(), GetDelay(_)).WillRepeatedly(Return(default_delay()));
|
| @@ -858,6 +1029,8 @@ TEST_F(SyncSchedulerImplTest, TypeThrottlingDoesBlockOtherSources) {
|
| PumpLoop(); // To get PerformDelayedNudge called.
|
| PumpLoop(); // To get TrySyncCycleJob called
|
| EXPECT_TRUE(GetThrottledTypes().HasAll(throttled_types));
|
| + EXPECT_FALSE(scheduler()->IsBackingOff());
|
| + EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
|
|
|
| // Ignore invalidations for throttled types.
|
| scheduler()->ScheduleInvalidationNudge(THEMES, BuildInvalidation(10, "test"),
|
| @@ -881,6 +1054,54 @@ TEST_F(SyncSchedulerImplTest, TypeThrottlingDoesBlockOtherSources) {
|
| StopSyncScheduler();
|
| }
|
|
|
| +TEST_F(SyncSchedulerImplTest, TypeBackingOffDoesBlockOtherSources) {
|
| + UseMockDelayProvider();
|
| + EXPECT_CALL(*delay(), GetDelay(_)).WillRepeatedly(Return(long_delay()));
|
| +
|
| + SyncShareTimes times;
|
| + TimeDelta poll(TimeDelta::FromDays(1));
|
| + scheduler()->OnReceivedLongPollIntervalUpdate(poll);
|
| +
|
| + const ModelTypeSet backed_off_types(THEMES);
|
| + const ModelTypeSet unbacked_off_types(PREFERENCES);
|
| +
|
| + ::testing::InSequence seq;
|
| + EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
|
| + .WillOnce(
|
| + DoAll(WithArg<2>(test_util::SimulatePartialFailure(backed_off_types)),
|
| + Return(false)))
|
| + .RetiresOnSaturation();
|
| +
|
| + StartSyncScheduler(base::Time());
|
| + scheduler()->ScheduleLocalNudge(backed_off_types, FROM_HERE);
|
| + PumpLoop(); // To get PerformDelayedNudge called.
|
| + PumpLoop(); // To get TrySyncCycleJob called
|
| + EXPECT_TRUE(GetBackedOffTypes().HasAll(backed_off_types));
|
| + EXPECT_FALSE(scheduler()->IsBackingOff());
|
| + EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
|
| +
|
| + // Ignore invalidations for backed off types.
|
| + scheduler()->ScheduleInvalidationNudge(THEMES, BuildInvalidation(10, "test"),
|
| + FROM_HERE);
|
| + PumpLoop();
|
| +
|
| + // Ignore refresh requests for backed off types.
|
| + scheduler()->ScheduleLocalRefreshRequest(backed_off_types, FROM_HERE);
|
| + PumpLoop();
|
| +
|
| + Mock::VerifyAndClearExpectations(syncer());
|
| +
|
| + // Local nudges for non-backed off types will trigger a sync.
|
| + EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
|
| + .WillRepeatedly(DoAll(Invoke(test_util::SimulateNormalSuccess),
|
| + RecordSyncShare(×, true)));
|
| + scheduler()->ScheduleLocalNudge(unbacked_off_types, FROM_HERE);
|
| + RunLoop();
|
| + Mock::VerifyAndClearExpectations(syncer());
|
| +
|
| + StopSyncScheduler();
|
| +}
|
| +
|
| // Test nudges / polls don't run in config mode and config tasks do.
|
| TEST_F(SyncSchedulerImplTest, ConfigurationMode) {
|
| TimeDelta poll(TimeDelta::FromMilliseconds(15));
|
|
|