Bug 1384721 - fix pocket network activity during tests, r?Mardak draft
authorDan Mosedale <<dmose@mozilla.org>>
Wed, 26 Jul 2017 14:32:42 -0700
changeset 616199 faaaea4ce94ac38726fc7c83c28be19c2032af33
parent 615935 388d81ed93fa640f91d155f36254667c734157cf
child 639425 32e764cfb06c961af3460d69a61fe8ca300f0d0c
push id70633
push userdmosedale@mozilla.com
push dateWed, 26 Jul 2017 21:33:47 +0000
reviewersMardak
bugs1384721
milestone56.0a1
Bug 1384721 - fix pocket network activity during tests, r?Mardak MozReview-Commit-ID: G9mGNt5imhr
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
@@ -138,8 +138,11 @@ user_pref("places.history.enabled", fals
 user_pref("plugin.load_flash_only", false);
 
 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
+user_pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -293,16 +293,17 @@ user_pref("browser.translation.yandex.tr
 user_pref("browser.translation.engine", "bing");
 
 // 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);
 
 // 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
@@ -94,16 +94,17 @@ DEFAULTS = dict(
         'network.proxy.type': 1,
         '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.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':