www

commit 2df630e83c5158d639e9776a435713867aef51c3
parent 096507984274a2db1264758624c59b2855e4fb9c
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 22 Sep 2015 04:10:52 -0400

Fix hang in sync tests from library version changes

Diffstat:
M
chrome/content/zotero/xpcom/sync/syncEngine.js
 | 
8
++++++--

1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/xpcom/sync/syncEngine.js b/chrome/content/zotero/xpcom/sync/syncEngine.js
@@ -48,6 +48,8 @@ Zotero.Sync.Data.Engine = function (options) {
 	
 	this.apiClient = options.apiClient;
 	this.libraryID = options.libraryID;
+	this.library = Zotero.Libraries.get(options.libraryID);
+	// TODO: Remove
 	this.libraryName = Zotero.Libraries.getName(options.libraryID);
 	this.libraryType = Zotero.Libraries.getType(options.libraryID);
 	switch (this.libraryType) {
@@ -691,7 +693,8 @@ Zotero.Sync.Data.Engine.prototype._startUpload = Zotero.Promise.coroutine(functi
 					for (let i = 0; i < toSave.length; i++) {
 						yield toSave[i].save();
 					}
-					yield Zotero.Libraries.setVersion(this.libraryID, json.libraryVersion);
+					this.library.libraryVersion = json.libraryVersion;
+					yield this.library.save();
 					objectsClass.updateVersion(ids, json.libraryVersion);
 					objectsClass.updateSynced(ids, true);
 				}.bind(this));
@@ -940,7 +943,8 @@ Zotero.Sync.Data.Engine.prototype._upgradeCheck = Zotero.Promise.coroutine(funct
 		}
 		
 		// Mark library as requiring full sync
-		yield Zotero.Libraries.setVersion(this.libraryID, -1);
+		this.library.libraryVersion = -1;
+		yield this.library.save();
 		
 		// If this is the last classic sync library, delete old timestamps
 		if (!(yield Zotero.DB.valueQueryAsync("SELECT COUNT(*) FROM libraries WHERE version=0"))) {