Bug 1293426 - Allow TPS config to specify preference values so it can be pointed at non-production servers r?markh draft
authorThom Chiovoloni <tchiovoloni@mozilla.com>
Thu, 11 Aug 2016 10:18:13 -0400
changeset 399626 7517a718e512310687fb61a0f245b252ab7ba945
parent 398701 2f2fbdf92d8baf898ea559e6a9cff02e174c0d5e
child 527988 23ab9e1c78c7eb66334fe3644ff92db5589fad37
push id25901
push userbmo:tchiovoloni@mozilla.com
push dateThu, 11 Aug 2016 17:33:44 +0000
reviewersmarkh
bugs1293426
milestone51.0a1
Bug 1293426 - Allow TPS config to specify preference values so it can be pointed at non-production servers r?markh MozReview-Commit-ID: 8NDJwIaurVF
testing/tps/tps/testrunner.py
--- a/testing/tps/tps/testrunner.py
+++ b/testing/tps/tps/testrunner.py
@@ -366,16 +366,19 @@ class TPSTestRunner(object):
         # 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)
 
+        if 'preferences' in self.config:
+            self.preferences.update(self.config['preferences'])
+
     def run_tests(self):
         # delete the logfile if it already exists
         if os.access(self.logfile, os.F_OK):
             os.remove(self.logfile)
 
         # Copy the system env variables, and update them for custom settings
         self.env = os.environ.copy()
         self.env.update(self.extra_env)