From df8f10bb69a862dd89bd48eb121f40f24dfe99d9 Mon Sep 17 00:00:00 2001
From: Thom Chiovoloni <tchiovoloni@mozilla.com>
Date: Thu, 11 Aug 2016 10:18:13 -0400
Subject: [PATCH] Bug 1293426 - Allow TPS config to specify preference values
 so it can be pointed at non-production servers r=markh

MozReview-Commit-ID: 8NDJwIaurVF

--HG--
extra : rebase_source : 05df5a1383d9194100159e2275971803b757b45b
---
 testing/tps/tps/testrunner.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/testing/tps/tps/testrunner.py b/testing/tps/tps/testrunner.py
index a2e26f63f7e1..1a318a5efdaa 100644
--- a/testing/tps/tps/testrunner.py
+++ b/testing/tps/tps/testrunner.py
@@ -371,6 +371,9 @@ class TPSTestRunner(object):
         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):