Bug 617173 - Merge fx-sync to mozilla-central. a=blocking
authorPhilipp von Weitershausen <philipp@weitershausen.de>
Tue, 07 Dec 2010 13:21:53 -0800
changeset 58799 55adcf8cfb94a55c60c72cd10a12f860734a522d
parent 58798 302d8ae094028d135824c7e8ba45130adce26b8c (current diff)
parent 58797 f11c4d60b43cacb5650008d8991e69b69d54f023 (diff)
child 58800 d2f3fcf3b1db251d1e5863ed2b8bb3d3fb15bfcf
push idunknown
push userunknown
push dateunknown
reviewersblocking
bugs617173
milestone2.0b8pre
Bug 617173 - Merge fx-sync to mozilla-central. a=blocking
--- a/services/sync/tests/unit/test_service_sync_updateEnabledEngines.js
+++ b/services/sync/tests/unit/test_service_sync_updateEnabledEngines.js
@@ -211,21 +211,21 @@ function test_disabledRemotely() {
     Service._ignorePrefObserver = true;
     engine.enabled = true;
     Service._ignorePrefObserver = false;
 
     _("Sync.");
     Weave.Service.login();
     Weave.Service.sync();
 
-    _("Engine is disabled.");
-    do_check_false(engine.enabled);
+    _("Engine is not disabled: only one client.");
+    do_check_true(engine.enabled);
+    
+    // TODO: add a second client and verify that the local pref is changed.
 
-    _("Meta record isn't uploaded.");
-    do_check_false(!!metaWBO.data.engines.steam);
   } finally {
     server.stop(do_test_finished);
     Service.startOver();
   }
 }
 
 function test_dependentEnginesEnabledLocally() {
   _("Test: Engine is disabled on remote clients and enabled locally");