Bug 1093691 - Make --e10s=false explictly disable e10s prefs. r=jmaher
authorFelipe Gomes <felipc@gmail.com>
Tue, 04 Nov 2014 19:01:06 -0200
changeset 817 42da1a784ba781dd2db3bb68821f46c3684e58bf
parent 816 e4a77270a43ad63231c713b6aeba02210623c5c9
child 818 017dca37f35c1bd6aab1aad74c7eae1bfeb17cfc
push id540
push userfelipc@gmail.com
push dateTue, 04 Nov 2014 21:01:55 +0000
reviewersjmaher
bugs1093691
Bug 1093691 - Make --e10s=false explictly disable e10s prefs. r=jmaher
talos/PerfConfigurator.py
--- a/talos/PerfConfigurator.py
+++ b/talos/PerfConfigurator.py
@@ -489,16 +489,20 @@ the highest value.
                 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                 s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
                 s.bind(("127.0.0.1",15707))
                 self.config['webserver'] = 'localhost:%s' % s.getsockname()[1]
 
         # if e10s is enabled, set prefs accordingly
         if self.config.get('e10s'):
             self.config['preferences']['browser.tabs.remote.autostart'] = True
+        else:
+            self.config['preferences']['browser.tabs.remote.autostart'] = False
+            self.config['preferences']['browser.tabs.remote.autostart.1'] = False
+            self.config['preferences']['browser.tabs.remote.autostart.2'] = False
 
         extraPrefs = self.config.pop('extraPrefs', {})
         extraPrefs = dict([(i, utils.parsePref(j)) for i, j in extraPrefs.items()])
         self.config['preferences'].update(extraPrefs)
         # remove None values from preferences;
         # allows overrides
         self.config['preferences'] = dict([(key,value)
                                            for key, value in self.config['preferences'].items()