Bug 1239552 - Disable additional welcome URL in automation; r?automatedtester draft
authorAndreas Tolfsen <ato@mozilla.com>
Tue, 19 Jul 2016 12:54:54 +0100
changeset 389470 6b5801d3bd8956efc68f42348235ab3f38771d6b
parent 389281 feaaf1af1065257b9178faca8b67eed9657b4a17
child 525765 137145c7a18ab0ba0618a04fc3bb3b977fca489d
push id23420
push userbmo:ato@mozilla.com
push dateTue, 19 Jul 2016 12:25:24 +0000
reviewersautomatedtester
bugs1239552
milestone50.0a1
Bug 1239552 - Disable additional welcome URL in automation; r?automatedtester The preference startup.homepage_welcome_url.additional causes problems with official branded builds and breaks certain Marionette tests, such as testing/marionette/harness/marionette/tests/unit/test_window_handles.py and testing/marionette/harness/marionette/tests/unit/test_selected.py. Many Marionette tests make assumptions about the number of open windows, and this aligns the test environment of the officially branded builds to be more similar to that of Nightly builds. There is another issue in Marionette, described in bug 1239552, that we register the listener IPC message handlers twice. This patch does not directly address that problem. MozReview-Commit-ID: KEdJEcOxyGy
testing/marionette/client/marionette_driver/geckoinstance.py
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -32,17 +32,18 @@ class GeckoInstance(object):
         "dom.ipc.reportProcessHangs": False,
         # Only install add-ons from the profile and the application scope
         # Also ensure that those are not getting disabled.
         # see: https://developer.mozilla.org/en/Installing_extensions
         "extensions.enabledScopes": 5,
         "extensions.autoDisableScopes": 10,
         "focusmanager.testmode": True,
         "marionette.defaultPrefs.enabled": True,
-        "startup.homepage_welcome_url": "about:blank",
+        "startup.homepage_welcome_url": "",
+        "startup.homepage_welcome_url.additional": "",
         "toolkit.telemetry.enabled": False,
         # Until Bug 1238095 is fixed, we have to enable CPOWs in order
         # for Marionette tests to work properly.
         "dom.ipc.cpows.forbid-unsafe-from-browser": False,
     }
 
     def __init__(self, host, port, bin, profile=None, addons=None,
                  app_args=None, symbols_path=None, gecko_log=None, prefs=None,
@@ -293,16 +294,17 @@ class B2GDesktopInstance(GeckoInstance):
         self.app_args += ['-chrome', 'chrome://b2g/content/shell.html']
 
 
 class DesktopInstance(GeckoInstance):
     desktop_prefs = {
         'app.update.auto': False,
         'app.update.enabled': False,
         'browser.dom.window.dump.enabled': True,
+        'browser.firstrun-content.dismissed': True,
         # Bug 1145668 - Has to be reverted to about:blank once Marionette
         # can correctly handle error pages
         'browser.newtab.url': 'about:newtab',
         'browser.newtabpage.enabled': False,
         'browser.reader.detectedFirstArticle': True,
         'browser.safebrowsing.phishing.enabled': False,
         'browser.safebrowsing.forbiddenURIs.enabled': False,
         'browser.safebrowsing.malware.enabled': False,