From 85cf8bda88742550e505cb73d93dc8d288fabaed Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Wed, 3 Feb 2016 11:21:09 +1100
Subject: [PATCH] Bug 1241715 - get Sync TPS tests working locally by tweaking
 observers listened for and the authentication setup. r=whimboo

---
 .../tps/extensions/tps/resource/modules/history.jsm    |  2 +-
 services/sync/tps/extensions/tps/resource/tps.jsm      |  2 +-
 testing/tps/tps/testrunner.py                          | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/services/sync/tps/extensions/tps/resource/modules/history.jsm b/services/sync/tps/extensions/tps/resource/modules/history.jsm
index 20edfc9a6f7..a0871a39908 100644
--- a/services/sync/tps/extensions/tps/resource/modules/history.jsm
+++ b/services/sync/tps/extensions/tps/resource/modules/history.jsm
@@ -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 +
diff --git a/services/sync/tps/extensions/tps/resource/tps.jsm b/services/sync/tps/extensions/tps/resource/tps.jsm
index 02b304b675b..ee0d64b9386 100644
--- a/services/sync/tps/extensions/tps/resource/tps.jsm
+++ b/services/sync/tps/extensions/tps/resource/tps.jsm
@@ -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() {
diff --git a/testing/tps/tps/testrunner.py b/testing/tps/tps/testrunner.py
index 9068cf34a1d..4f85c876700 100644
--- a/testing/tps/tps/testrunner.py
+++ b/testing/tps/tps/testrunner.py
@@ -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)