From 3281e806f9bbc78af5e832a9e94c73f3a7b28a41 Mon Sep 17 00:00:00 2001 From: Ed Lee Date: Wed, 2 Aug 2017 16:19:03 -0700 Subject: [PATCH] Revert "tests(mc): #3056 Patch for pine to disable snippets in tests" (#3077) --- mozilla-central-patches/disable-snippets.diff | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 mozilla-central-patches/disable-snippets.diff diff --git a/mozilla-central-patches/disable-snippets.diff b/mozilla-central-patches/disable-snippets.diff deleted file mode 100644 index 055ce922b8..0000000000 --- a/mozilla-central-patches/disable-snippets.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/layout/tools/reftest/reftest-preferences.js b/layout/tools/reftest/reftest-preferences.js ---- a/layout/tools/reftest/reftest-preferences.js -+++ b/layout/tools/reftest/reftest-preferences.js -@@ -144,5 +144,6 @@ user_pref("media.openUnsupportedTypeWith - // 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); -diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js ---- a/testing/profiles/prefs_general.js -+++ b/testing/profiles/prefs_general.js -@@ -305,6 +305,7 @@ user_pref("browser.aboutHomeSnippets.upd - 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}'); -diff --git a/testing/talos/talos/config.py b/testing/talos/talos/config.py ---- a/testing/talos/talos/config.py -+++ b/testing/talos/talos/config.py -@@ -100,6 +100,7 @@ DEFAULTS = dict( - '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,