Bug 1293426 - Allow TPS config to specify preference values so it can be pointed at non-production servers r=markh
authorThom Chiovoloni <tchiovoloni@mozilla.com>
Thu, 11 Aug 2016 10:18:13 -0400
changeset 400412 2c7b15b477edf62c55d197623f3517028c94daa1
parent 400411 0e721493391dbe19a6d8d89136ce69f476d3186e
child 400413 f90cbdbd61d2beed65814c1940bb0ddaaaf65601
push id26138
push usergszorc@mozilla.com
push dateSat, 13 Aug 2016 03:04:36 +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)