From be3a852b6029e177120c3e85c2cd398bf9702c88 Mon Sep 17 00:00:00 2001 From: Richard Newman Date: Fri, 27 Dec 2013 21:12:50 -0800 Subject: [PATCH] Bug 953282 - Fix idle observer notification, after Bug 715041 broke in-tree consumers. r=gps --- services/sync/modules/policies.js | 2 +- services/sync/tests/unit/test_interval_triggers.js | 4 ++-- services/sync/tests/unit/test_syncscheduler.js | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/services/sync/modules/policies.js b/services/sync/modules/policies.js index 55bd147a3b1..cf2931ca93a 100644 --- a/services/sync/modules/policies.js +++ b/services/sync/modules/policies.js @@ -218,7 +218,7 @@ SyncScheduler.prototype = { // were just active.) this.adjustSyncInterval(); break; - case "back": + case "active": this._log.trace("Received notification that we're back from idle."); this.idle = false; Utils.namedTimer(function onBack() { diff --git a/services/sync/tests/unit/test_interval_triggers.js b/services/sync/tests/unit/test_interval_triggers.js index c3f48512cd5..0f355e636e3 100644 --- a/services/sync/tests/unit/test_interval_triggers.js +++ b/services/sync/tests/unit/test_interval_triggers.js @@ -270,7 +270,7 @@ add_identity_test(this, function test_back_triggers_sync() { // Single device: no sync triggered. scheduler.idle = true; - scheduler.observe(null, "back", Svc.Prefs.get("scheduler.idleTime")); + scheduler.observe(null, "active", Svc.Prefs.get("scheduler.idleTime")); do_check_false(scheduler.idle); // Multiple devices: sync is triggered. @@ -291,7 +291,7 @@ add_identity_test(this, function test_back_triggers_sync() { }); scheduler.idle = true; - scheduler.observe(null, "back", Svc.Prefs.get("scheduler.idleTime")); + scheduler.observe(null, "active", Svc.Prefs.get("scheduler.idleTime")); do_check_false(scheduler.idle); yield deferred.promise; }); diff --git a/services/sync/tests/unit/test_syncscheduler.js b/services/sync/tests/unit/test_syncscheduler.js index 694da6179fe..8f3f2b126b6 100644 --- a/services/sync/tests/unit/test_syncscheduler.js +++ b/services/sync/tests/unit/test_syncscheduler.js @@ -638,12 +638,12 @@ add_identity_test(this, function test_back_triggersSync() { cleanUpAndGo().then(deferred.resolve); }); - // Send a 'back' event to trigger sync soonish. - scheduler.observe(null, "back", Svc.Prefs.get("scheduler.idleTime")); + // Send an 'active' event to trigger sync soonish. + scheduler.observe(null, "active", Svc.Prefs.get("scheduler.idleTime")); yield deferred.promise; }); -add_identity_test(this, function test_back_triggersSync_observesBackoff() { +add_identity_test(this, function test_active_triggersSync_observesBackoff() { // Confirm defaults. do_check_false(scheduler.idle); @@ -669,8 +669,8 @@ add_identity_test(this, function test_back_triggersSync_observesBackoff() { cleanUpAndGo().then(deferred.resolve); }, IDLE_OBSERVER_BACK_DELAY * 1.5, {}, "timer"); - // Send a 'back' event to try to trigger sync soonish. - scheduler.observe(null, "back", Svc.Prefs.get("scheduler.idleTime")); + // Send an 'active' event to try to trigger sync soonish. + scheduler.observe(null, "active", Svc.Prefs.get("scheduler.idleTime")); yield deferred.promise; }); @@ -691,7 +691,7 @@ add_identity_test(this, function test_back_debouncing() { Svc.Obs.add("weave:service:login:start", onLoginStart); // Create spurious back-then-idle events as observed on OS X: - scheduler.observe(null, "back", Svc.Prefs.get("scheduler.idleTime")); + scheduler.observe(null, "active", Svc.Prefs.get("scheduler.idleTime")); scheduler.observe(null, "idle", Svc.Prefs.get("scheduler.idleTime")); let deferred = Promise.defer();