Bug 1355888 - Remove marionette.enabled pref from wptrunner; r?jgraham draft
authorAndreas Tolfsen <ato@mozilla.com>
Thu, 13 Apr 2017 15:09:11 +0100
changeset 571912 5c77e2694f8ac0269e6b333efd222212e21e73ac
parent 571911 c6dd72d35baff4c8694ebc044fc02c03c413956d
child 571913 137018a03ac09e93c11ce7205fdd90865798fec7
push id56952
push userbmo:ato@mozilla.com
push dateWed, 03 May 2017 13:42:09 +0000
reviewersjgraham
bugs1355888
milestone55.0a1
Bug 1355888 - Remove marionette.enabled pref from wptrunner; r?jgraham MozReview-Commit-ID: IzASL0SBCsR
testing/web-platform/harness/wptrunner/browsers/firefox.py
--- a/testing/web-platform/harness/wptrunner/browsers/firefox.py
+++ b/testing/web-platform/harness/wptrunner/browsers/firefox.py
@@ -168,18 +168,17 @@ class FirefoxBrowser(Browser):
         env["MOZ_DISABLE_NONLOCAL_CONNECTIONS"] = "1"
 
         locations = ServerLocations(filename=os.path.join(here, "server-locations.txt"))
 
         preferences = self.load_prefs()
 
         self.profile = FirefoxProfile(locations=locations,
                                       preferences=preferences)
-        self.profile.set_preferences({"marionette.enabled": True,
-                                      "marionette.port": self.marionette_port,
+        self.profile.set_preferences({"marionette.port": self.marionette_port,
                                       "dom.disable_open_during_load": False,
                                       "network.dns.localDomains": ",".join(hostnames),
                                       "network.proxy.type": 0,
                                       "places.history.enabled": False})
         if self.e10s:
             self.profile.set_preferences({"browser.tabs.remote.autostart": True})
 
         if self.leak_check and kwargs.get("check_leaks", True):