Bug 1093691 - Part 2. Safeguard Marionette harness from e10s-on-nightly pref. r=cmanchester
authorFelipe Gomes <felipc@gmail.com>
Wed, 05 Nov 2014 02:13:19 -0200
changeset 214089 800cc62253362942c076182ff54449354d50e624
parent 214088 75c3a88013e61cee7e45a3cff55892cf28ba2205
child 214090 0c04ff1ef5a9749877b9cafc488f608647af01b3
push id51425
push userfelipc@gmail.com
push dateWed, 05 Nov 2014 18:03:03 +0000
treeherdermozilla-inbound@0c04ff1ef5a9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscmanchester
bugs1093691
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1093691 - Part 2. Safeguard Marionette harness from e10s-on-nightly pref. r=cmanchester
testing/marionette/client/marionette/geckoinstance.py
--- a/testing/marionette/client/marionette/geckoinstance.py
+++ b/testing/marionette/client/marionette/geckoinstance.py
@@ -21,17 +21,19 @@ class GeckoInstance(object):
                       "browser.shell.checkDefaultBrowser": False,
                       "browser.startup.page": 0,
                       "browser.sessionstore.resume_from_crash": False,
                       "browser.warnOnQuit": False,
                       "browser.displayedE10SPrompt": 5,
                       "browser.displayedE10SPrompt.1": 5,
                       "browser.displayedE10SPrompt.2": 5,
                       "browser.displayedE10SPrompt.3": 5,
-                      "browser.displayedE10SPrompt.4": 5}
+                      "browser.displayedE10SPrompt.4": 5,
+                      "browser.tabs.remote.autostart.1": False,
+                      "browser.tabs.remote.autostart.2": False}
 
     def __init__(self, host, port, bin, profile, app_args=None, symbols_path=None,
                   gecko_log=None, prefs=None):
         self.marionette_host = host
         self.marionette_port = port
         self.bin = bin
         self.profile_path = profile
         self.prefs = prefs