diff --git a/services/sync/tps/extensions/tps/resource/modules/formautofill.jsm b/services/sync/tps/extensions/tps/resource/modules/formautofill.jsm index f00a63f324a5..8766bd87e233 100644 --- a/services/sync/tps/extensions/tps/resource/modules/formautofill.jsm +++ b/services/sync/tps/extensions/tps/resource/modules/formautofill.jsm @@ -19,7 +19,7 @@ const { Logger } = ChromeUtils.import("resource://tps/logger.jsm"); ChromeUtils.defineModuleGetter( this, "formAutofillStorage", - "resource://formautofill/FormAutofillStorage.jsm" + "resource://autofill/FormAutofillStorage.jsm" ); ChromeUtils.defineModuleGetter( diff --git a/testing/tps/config/config.json.in b/testing/tps/config/config.json.in index 53ccb016c46b..38cf3746284c 100644 --- a/testing/tps/config/config.json.in +++ b/testing/tps/config/config.json.in @@ -1,19 +1,8 @@ { - "sync_account": { - "username": "__SYNC_ACCOUNT_USERNAME__", - "password": "__SYNC_ACCOUNT_PASSWORD__", - "passphrase": "__SYNC_ACCOUNT_PASSPHRASE__" - }, "fx_account": { "username": "__FX_ACCOUNT_USERNAME__", "password": "__FX_ACCOUNT_PASSWORD__" }, - "email": { - "username": "crossweave@mozilla.com", - "password": "", - "passednotificationlist": ["crossweave@mozilla.com"], - "notificationlist": ["crossweave@mozilla.com"] - }, "auth_type": "fx_account", "es": "localhost:9200", "os": "Ubuntu", diff --git a/testing/tps/tps/testrunner.py b/testing/tps/tps/testrunner.py index 3e7cf28025cd..c6259b5bd164 100644 --- a/testing/tps/tps/testrunner.py +++ b/testing/tps/tps/testrunner.py @@ -425,11 +425,7 @@ class TPSTestRunner(object): else: try: - if self.numfailed > 0 or self.numpassed == 0: - To = self.config["email"].get("notificationlist") - else: - To = self.config["email"].get("passednotificationlist") - self.writeToResultFile(self.postdata, sendTo=To) + self.writeToResultFile(self.postdata) except Exception: traceback.print_exc() try: