Bug 1488826 - [marionette] Disable content blocking introduction panel. r=ato, a=test-only
authorHenrik Skupin <mail@hskupin.info>
Tue, 06 Nov 2018 13:35:33 +0000
changeset 501066 5b42d14602aacbaf0aa2bbdcbfb7cf2100cb162e
parent 501065 6900e33d73082d4dd29a9efa1737e1b29af52c52
child 501067 2f1f32b76f7ee4fa06d9ad1e7a7929554293f48a
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato, test-only
bugs1488826
milestone64.0
Bug 1488826 - [marionette] Disable content blocking introduction panel. r=ato, a=test-only Differential Revision: https://phabricator.services.mozilla.com/D11007
testing/marionette/client/marionette_driver/geckoinstance.py
testing/marionette/components/marionette.js
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -495,16 +495,20 @@ class DesktopInstance(GeckoInstance):
     desktop_prefs = {
         # Disable application updates
         "app.update.disabledForTesting": True,
         "security.turn_off_all_security_so_that_viruses_can_take_over_this_computer": True,
         # app.update.enabled is being removed. Once Firefox 62 becomes stable,
         # the line below can be removed as well.
         "app.update.enabled": False,
 
+        # Don't show the content blocking introduction panel
+        # We use a larger number than the default 22 to have some buffer
+        "browser.contentblocking.introCount": 99,
+
         # Enable output of dump()
         "browser.dom.window.dump.enabled": True,
 
         # Indicate that the download panel has been shown once so that whichever
         # download test runs first doesn"t show the popup inconsistently
         "browser.download.panel.shown": True,
 
         # Do not show the EULA notification which can interfer with tests
--- a/testing/marionette/components/marionette.js
+++ b/testing/marionette/components/marionette.js
@@ -73,16 +73,20 @@ const RECOMMENDED_PREFS = new Map([
   // This is to accommodate the fact that test environments tends to be
   // slower than production environments (with the b2g emulator being
   // the slowest of them all), resulting in the production timeout value
   // sometimes being exceeded and causing false-positive test failures.
   //
   // (bug 1176798, bug 1177018, bug 1210465)
   ["apz.content_response_timeout", 60000],
 
+  // Don't show the content blocking introduction panel.
+  // We use a larger number than the default 22 to have some buffer
+  ["browser.contentblocking.introCount", 99],
+
   // Indicate that the download panel has been shown once so that
   // whichever download test runs first doesn't show the popup
   // inconsistently.
   ["browser.download.panel.shown", true],
 
   // Background thumbnails in particular cause grief, and disabling
   // thumbnails in general cannot hurt
   ["browser.pagethumbnails.capturing_disabled", true],