Remove custom FirefoxRunner subclass
This was only being used to set prefs and most prefs are either
already set in
testing/profiles/[common|unittest|web-platform-tests].js or can be set
there so they apply to desktop too.
Differential Revision: https://phabricator.services.mozilla.com/D13088
bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1510254
gecko-commit: ed149f9cf50a61f1a6f90f3163d89d809414d632
gecko-integration-branch: autoland
gecko-reviewers: gbrown, KWierso
diff --git a/tools/wptrunner/wptrunner/browsers/fennec.py b/tools/wptrunner/wptrunner/browsers/fennec.py
index 46faf1b..6da3d35 100644
--- a/tools/wptrunner/wptrunner/browsers/fennec.py
+++ b/tools/wptrunner/wptrunner/browsers/fennec.py
@@ -31,61 +31,11 @@
"run_info_extras": "run_info_extras",
"update_properties": "update_properties"}
-class FennecProfile(FirefoxProfile):
- # WPT-specific prefs are set in FennecBrowser.start()
- FirefoxProfile.preferences.update({
- # Make sure Shield doesn't hit the network.
- "app.normandy.api_url": "",
- # Increase the APZ content response timeout in tests to 1 minute.
- "apz.content_response_timeout": 60000,
- # Enable output for dump() and chrome console API
- "browser.dom.window.dump.enabled": True,
- "devtools.console.stdout.chrome": True,
- # Disable safebrowsing components
- "browser.safebrowsing.blockedURIs.enabled": False,
- "browser.safebrowsing.downloads.enabled": False,
- "browser.safebrowsing.passwords.enabled": False,
- "browser.safebrowsing.malware.enabled": False,
- "browser.safebrowsing.phishing.enabled": False,
- # Do not restore the last open set of tabs if the browser has crashed
- "browser.sessionstore.resume_from_crash": False,
- # Disable Android snippets
- "browser.snippets.enabled": False,
- "browser.snippets.syncPromo.enabled": False,
- "browser.snippets.firstrunHomepage.enabled": False,
- # Do not allow background tabs to be zombified, otherwise for tests that
- # open additional tabs, the test harness tab itself might get unloaded
- "browser.tabs.disableBackgroundZombification": True,
- # Disable e10s by default
- "browser.tabs.remote.autostart": False,
- # Don't warn when exiting the browser
- "browser.warnOnQuit": False,
- # Don't send Firefox health reports to the production server
- "datareporting.healthreport.about.reportUrl": "http://%(server)s/dummy/abouthealthreport/",
- # Automatically unload beforeunload alerts
- "dom.disable_beforeunload": True,
- # Disable the ProcessHangMonitor
- "dom.ipc.reportProcessHangs": False,
- # No slow script dialogs
- "dom.max_chrome_script_run_time": 0,
- "dom.max_script_run_time": 0,
- # Make sure opening about:addons won"t hit the network
- "extensions.webservice.discoverURL": "http://%(server)s/dummy/discoveryURL",
- # No hang monitor
- "hangmonitor.timeout": 0,
-
- "javascript.options.showInConsole": True,
- # Ensure blocklist updates don't hit the network
- "services.settings.server": "http://%(server)s/dummy/blocklist/",
- # Disable password capture, so that tests that include forms aren"t
- # influenced by the presence of the persistent doorhanger notification
- "signon.rememberSignons": False,
- })
-
def check_args(**kwargs):
pass
+
def browser_kwargs(test_type, run_info_data, config, **kwargs):
return {"package_name": kwargs["package_name"],
"device_serial": kwargs["device_serial"],
@@ -183,7 +133,7 @@
preferences = self.load_prefs()
- self.profile = FennecProfile(preferences=preferences)
+ self.profile = FirefoxProfile(preferences=preferences)
self.profile.set_preferences({"marionette.port": self.marionette_port,
"dom.disable_open_during_load": False,
"places.history.enabled": False,