Added 'resync on second computer' step to test_passwords.

services/sync/tests/unit/test_passwords.js

@@ -76,6 +76,11 @@ function run_test() {
   fakeLoginManager.fakeLogins.pop();
 
   runAndEnsureSuccess("remove user and re-sync", freshEngineSync);
+
+  fakeFilesystem.fakeContents = {};
+  fakeLoginManager.fakeLogins = [];
+
+  runAndEnsureSuccess("resync on second computer", freshEngineSync);
 }
 
 // ----------------------------------------
@@ -112,7 +117,7 @@ var fprefs = new FakePrefService(__fakePrefs);
 var fds = new FakeDAVService({});
 var fts = new FakeTimerService();
 var logStats = initTestLogging();
-var ffs = new FakeFilesystemService({});
+var fakeFilesystem = new FakeFilesystemService({});
 var fgs = new FakeGUIDService();
 var fakeLoginManager = new FakeLoginManager(__fakeLogins);
 
@@ -123,6 +128,13 @@ function FakeLoginManager(fakeLogins) {
 
   Utils.getLoginManager = function fake_getLoginManager() {
     // Return a fake nsILoginManager object.
-    return {getAllLogins: function() { return self.fakeLogins; }};
+    return {
+      getAllLogins: function() { return self.fakeLogins; },
+      addLogin: function(login) {
+        getTestLogger().info("nsILoginManager.addLogin() called " +
+                             "with hostname '" + login.hostname + "'.");
+        self.fakeLogins.push(login);
+      }
+    };
   };
 }

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

@@ -123,6 +123,48 @@ Testing	INFO	Opening 'weave/snapshots/passwords.json' for writing.
 Testing	INFO	Writing data to local file 'weave/snapshots/passwords.json': {"version":2,"GUID":"fake-guid-0","snapshot":{"805ec58eb8dcded602999967e139be21acd0f194":{"hostname":"www.boogle.com","formSubmitURL":"http://www.boogle.com/search","httpRealm":"","username":"","password":"","usernameField":"test_person","passwordField":"test_password"}}}
 Service.PasswordEngine	INFO	Sync complete
 Testing	INFO	Step 'remove user and re-sync' succeeded.
+Testing	INFO	Step 'resync on second computer' starting.
+Service.PasswordEngine	INFO	Beginning sync
+Testing	INFO	HTTP MKCOL on user-data/passwords/
+Service.RemoteStore	DEBUG	Downloading status file
+Testing	INFO	HTTP GET from user-data/passwords/status.json, returning status 200
+Service.Resource	DEBUG	GET request successful
+Service.JsonFilter	DEBUG	Decoding JSON data
+Service.RemoteStore	DEBUG	Downloading status file... done
+Service.PasswordEngine	DEBUG	Remote/local sync GUIDs do not match.  Forcing initial sync.
+Service.PasswordEngine	INFO	Local snapshot version: -1
+Service.PasswordEngine	INFO	Server maxVersion: 2
+Service.RemoteStore	INFO	Downloading all server data from scratch
+Service.RemoteStore	DEBUG	Downloading server snapshot
+Testing	INFO	HTTP GET from user-data/passwords/snapshot.json, returning status 200
+Service.Resource	DEBUG	GET request successful
+Service.CryptoFilter	DEBUG	Decrypting data
+Service.JsonFilter	DEBUG	Decoding JSON data
+Service.RemoteStore	DEBUG	Downloading server deltas
+Testing	INFO	HTTP GET from user-data/passwords/deltas.json, returning status 200
+Service.Resource	DEBUG	GET request successful
+Service.CryptoFilter	DEBUG	Decrypting data
+Service.JsonFilter	DEBUG	Decoding JSON data
+Service.SnapStore	TRACE	Processing command: {"action":"create","GUID":"1b3869fc36234b39cd354f661ed1d7d148394ca3","depth":0,"parents":[],"data":{"hostname":"www.yoogle.com","formSubmitURL":"http://www.yoogle.com/search","httpRealm":"","username":"","password":"","usernameField":"test_person2","passwordField":"test_password2"}}
+Service.SnapStore	TRACE	Processing command: {"action":"remove","GUID":"1b3869fc36234b39cd354f661ed1d7d148394ca3","depth":0,"parents":[]}
+Service.PasswordEngine	INFO	Reconciling client/server updates
+Service.PasswordSync	DEBUG	Reconciling 0 against 1 commands
+Service.PasswordEngine	INFO	Changes for client: 1
+Service.PasswordEngine	INFO	Predicted changes for server: 0
+Service.PasswordEngine	INFO	Client conflicts: 0
+Service.PasswordEngine	INFO	Server conflicts: 0
+Service.PasswordEngine	INFO	Applying changes locally
+Service.SnapStore	TRACE	Processing command: {"action":"create","GUID":"805ec58eb8dcded602999967e139be21acd0f194","depth":0,"parents":[],"data":{"hostname":"www.boogle.com","formSubmitURL":"http://www.boogle.com/search","httpRealm":"","username":"","password":"","usernameField":"test_person","passwordField":"test_password"}}
+Service.PasswordStore	TRACE	Processing command: {"action":"create","GUID":"805ec58eb8dcded602999967e139be21acd0f194","depth":0,"parents":[],"data":{"hostname":"www.boogle.com","formSubmitURL":"http://www.boogle.com/search","httpRealm":"","username":"","password":"","usernameField":"test_person","passwordField":"test_password"}}
+Service.PasswordStore	INFO	PasswordStore got createCommand: [object Object]
+Testing	INFO	nsILoginManager.addLogin() called with hostname 'www.boogle.com'.
+Service.SnapStore	INFO	Saving snapshot to disk
+Testing	INFO	Opening 'weave/snapshots/passwords.json' for writing.
+Testing	INFO	Writing data to local file 'weave/snapshots/passwords.json': {"version":2,"GUID":"fake-guid-0","snapshot":{"805ec58eb8dcded602999967e139be21acd0f194":{"hostname":"www.boogle.com","formSubmitURL":"http://www.boogle.com/search","httpRealm":"","username":"","password":"","usernameField":"test_person","passwordField":"test_password"}}}
+Service.PasswordEngine	INFO	Actual changes for server: 0
+Service.PasswordEngine	DEBUG	Actual changes for server: []
+Service.PasswordEngine	INFO	Sync complete
+Testing	INFO	Step 'resync on second computer' succeeded.
 *** test finished
 *** exiting
 *** PASS ***