mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1241715 - get Sync TPS tests working locally by tweaking observers listened for and the authentication setup. r=whimboo
This commit is contained in:
parent
f6b39209c3
commit
85cf8bda88
@ -161,7 +161,7 @@ var HistoryEntry = {
|
||||
}
|
||||
|
||||
let all_items_found = true;
|
||||
for (let itemvisit in item.visits) {
|
||||
for (let itemvisit of item.visits) {
|
||||
all_items_found = all_items_found && "found" in itemvisit;
|
||||
Logger.logInfo("History entry for " + item.uri + ", type:" +
|
||||
itemvisit.type + ", date:" + itemvisit.date +
|
||||
|
@ -888,7 +888,6 @@ var TPS = {
|
||||
// that complete.
|
||||
if (this.fxaccounts_enabled) {
|
||||
this._triggeredSync = true;
|
||||
this.waitForEvent("weave:service:sync:start");
|
||||
this.waitForSyncFinished();
|
||||
}
|
||||
},
|
||||
@ -919,6 +918,7 @@ var TPS = {
|
||||
this._triggeredSync = true;
|
||||
this.StartAsyncOperation();
|
||||
Weave.Service.sync();
|
||||
Logger.logInfo("Sync is complete");
|
||||
},
|
||||
|
||||
WipeServer: function TPS__WipeServer() {
|
||||
|
@ -342,11 +342,11 @@ class TPSTestRunner(object):
|
||||
if self.mobile:
|
||||
self.preferences.update({'services.sync.client.type' : 'mobile'})
|
||||
|
||||
# Set a dummy username to force the correct authentication type. For the
|
||||
# old sync, the username is not allowed to contain a '@'.
|
||||
dummy = {'fx_account': 'dummy@somewhere', 'sync_account': 'dummy'}
|
||||
auth_type = self.config.get('auth_type', 'fx_account')
|
||||
self.preferences.update({'services.sync.username': dummy[auth_type]})
|
||||
# If we are using legacy Sync, then set a dummy username to force the
|
||||
# correct authentication type. Without this pref set to a value
|
||||
# without an '@' character, Sync will initialize for FxA.
|
||||
if self.config.get('auth_type', 'fx_account') != "fx_account":
|
||||
self.preferences.update({'services.sync.username': "dummy"})
|
||||
|
||||
if self.debug:
|
||||
self.preferences.update(self.debug_preferences)
|
||||
|
Loading…
Reference in New Issue
Block a user