Bug 1386426 - Turn off snippets in activity stream for tests draft bug-1386426
authork88hudson <khudson@mozilla.com>
Tue, 01 Aug 2017 17:33:03 -0400
changeset 619310 c51b874c5e5adab11cd8c58485277a3e0ca9222e
parent 619309 a3e675a3b10a0ea289c301bedc31866f3daf7875
child 640364 5fc85440a020d4ca8d42e634346350ba2d011bb2
push id71644
push userkhudson@mozilla.com
push dateTue, 01 Aug 2017 21:33:33 +0000
bugs1386426
milestone56.0a1
Bug 1386426 - Turn off snippets in activity stream for tests MozReview-Commit-ID: DRcAwsJqq3q
layout/tools/reftest/reftest-preferences.js
testing/profiles/prefs_general.js
testing/talos/talos/config.py
--- a/layout/tools/reftest/reftest-preferences.js
+++ b/layout/tools/reftest/reftest-preferences.js
@@ -139,10 +139,11 @@ user_pref("plugin.load_flash_only", fals
 
 user_pref("media.openUnsupportedTypeWithExternalApp", false);
 
 // Disable all recommended Marionette preferences for Gecko tests.
 // The prefs recommended by Marionette are typically geared towards
 // consumer automation; not vendor testing.
 user_pref("marionette.prefs.recommended", false);
 
-// Make sure we don't reach out to the network with pocket
+// Make sure we don't reach out to the network with pocket or snippets
 user_pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
+user_pref("browser.newtabpage.activity-stream.feeds.snippets", false);
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -300,16 +300,17 @@ user_pref("browser.translation.engine", 
 
 // Make sure we don't try to load snippets from the network.
 user_pref("browser.aboutHomeSnippets.updateUrl", "nonexistent://test");
 
 // Use an empty list of sites to avoid fetching
 user_pref("browser.newtabpage.activity-stream.default.sites", "");
 user_pref("browser.newtabpage.activity-stream.telemetry", false);
 user_pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
+user_pref("browser.newtabpage.activity-stream.feeds.snippets", false);
 
 // Don't fetch directory tiles data from real servers
 user_pref("browser.newtabpage.directory.source", 'data:application/json,{"testing":1}');
 
 // Ensure UITour won't hit the network
 user_pref("browser.uitour.pinnedTabUrl", "http://%(server)s/uitour-dummy/pinnedTab");
 user_pref("browser.uitour.url", "http://%(server)s/uitour-dummy/tour");
 
--- a/testing/talos/talos/config.py
+++ b/testing/talos/talos/config.py
@@ -95,16 +95,17 @@ DEFAULTS = dict(
         'security.enable_java': False,
         'security.fileuri.strict_origin_policy': False,
         'dom.send_after_paint_to_content': True,
         'security.turn_off_all_security_so_that_viruses_can_'
         'take_over_this_computer': True,
         'browser.newtabpage.activity-stream.default.sites': '',
         'browser.newtabpage.activity-stream.telemetry': False,
         'browser.newtabpage.activity-stream.feeds.section.topstories': False,
+        'browser.newtabpage.activity-stream.feeds.snippets': False,
         'browser.newtabpage.directory.source':
             '${webserver}/directoryLinks.json',
         'browser.newtabpage.introShown': True,
         'browser.safebrowsing.downloads.remote.url':
             'http://127.0.0.1/safebrowsing-dummy/downloads',
         'browser.safebrowsing.provider.google.gethashURL':
             'http://127.0.0.1/safebrowsing-dummy/gethash',
         'browser.safebrowsing.provider.google.updateURL':