Refactored test_service a bit to use the synctestinginfrastructure.

services/sync/tests/unit/test_service.js

@@ -17,11 +17,6 @@ let __fakeDAVContents = {
   "public/pubkey" : '{"version":1,"algorithm":"RSA"}'
 };
 
-let __fakePasswords = {
-  'Mozilla Services Password': {foo: "bar"},
-  'Mozilla Services Encryption Passphrase': {foo: "passphrase"}
-};
-
 let Service = loadInSandbox("resource://weave/service.js");
 
 function TestService() {
@@ -37,25 +32,17 @@ TestService.prototype = {
 TestService.prototype.__proto__ = Service.WeaveSvc.prototype;
 
 function test_login_works() {
-  var fds = new FakeDAVService(__fakeDAVContents);
-  var fprefs = new FakePrefService(__fakePrefs);
-  var fpasses = new FakePasswordService(__fakePasswords);
-  var fts = new FakeTimerService();
-  var logStats = initTestLogging();
+  var syncTesting = new SyncTestingInfrastructure();
+
+  syncTesting.fakeDAVService.fakeContents = __fakeDAVContents;
+  for (name in __fakePrefs)
+    syncTesting.fakePrefService.fakeContents[name] = __fakePrefs[name];
+
   var testService = new TestService();
-  var finished = false;
-  var successful = false;
-  var onComplete = function(result) {
-    finished = true;
-    successful = result;
-  };
 
-  testService.login(onComplete);
+  function login(cb) {
+    testService.login(cb);
+  }
 
-  while (fts.processCallback()) {}
-
-  do_check_true(finished);
-  do_check_true(successful);
-  do_check_eq(logStats.errorsLogged, 0);
-  do_check_eq(Async.outstandingGenerators.length, 0);
+  syncTesting.runAsyncFunc("Logging in", login);
 }

services/sync/tests/unit/test_service.log.expected

@@ -1,6 +1,9 @@
 *** test pending
 Running test: test_login_works
 Service.Main	INFO	Weave Sync Service Initializing
+Testing	INFO	-----------------------------------------
+Testing	INFO	Step 'Logging in' starting.
+Testing	INFO	-----------------------------------------
 Service.Main	DEBUG	Logging in user foo
 Service.Main	INFO	Using server URL: https://example.com/user/foo
 Testing	INFO	HTTP GET from meta/version, returning status 200
@@ -8,6 +11,7 @@ Service.Main	TRACE	Retrieving keypair from server
 Testing	INFO	HTTP GET from private/privkey, returning status 200
 Testing	INFO	HTTP GET from public/pubkey, returning status 200
 Service.Main	INFO	Weave scheduler disabled
+Testing	INFO	Step 'Logging in' succeeded.
 1 of 1 tests passed.
 *** test finished
 *** exiting