Bug 604565 - Attempt to make tests hang less on OS X. [r=mconnor]

Reduce amount of pointless network calls by not registering any engines for tests that provide their own fake engine implementations anyway.

services/sync/tests/unit/test_service_sync_checkServerError.js

@@ -1,9 +1,11 @@
-Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/engines.js");
 Cu.import("resource://services-sync/status.js");
 Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/util.js");
 
+Svc.DefaultPrefs.set("registerEngines", "");
+Cu.import("resource://services-sync/service.js");
+
 initTestLogging();
 
 function CatapultEngine() {

services/sync/tests/unit/test_service_sync_updateEnabledEngines.js

@@ -1,4 +1,3 @@
-Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/engines.js");
 Cu.import("resource://services-sync/util.js");
 Cu.import("resource://services-sync/constants.js");
@@ -6,6 +5,11 @@ Cu.import("resource://services-sync/base_records/crypto.js");
 Cu.import("resource://services-sync/base_records/keys.js");
 Cu.import("resource://services-sync/base_records/wbo.js");
 
+Svc.DefaultPrefs.set("registerEngines", "");
+Cu.import("resource://services-sync/service.js");
+
+initTestLogging();
+
 function SteamEngine() {
   SyncEngine.call(this, "Steam");
 }

services/sync/tests/unit/test_service_wipeClient.js

@@ -1,5 +1,8 @@
-Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/engines.js");
+Cu.import("resource://services-sync/util.js");
+
+Svc.DefaultPrefs.set("registerEngines", "");
+Cu.import("resource://services-sync/service.js");
 
 
 function CanDecryptEngine() {

services/sync/tests/unit/test_service_wipeServer.js

@@ -1,9 +1,11 @@
 Cu.import("resource://services-sync/util.js");
-Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/base_records/crypto.js");
 Cu.import("resource://services-sync/base_records/keys.js");
 Cu.import("resource://services-sync/resource.js");
 
+Svc.DefaultPrefs.set("registerEngines", "");
+Cu.import("resource://services-sync/service.js");
+
 function FakeCollection() {
   this.deleted = false;
 }