commit 1891f376f6ae966d86818b891ef8b6bc250600f5 Author: Nathan Froyd froydnj@mozilla.com Date: Fri May 30 16:21:47 2014 -0400

Bug 1018400 - Disable safebrowsing during reftests. r=ted, a=test-only --- js/src/tests/user.js | 2 ++ layout/tools/reftest/runreftest.py | 3 +++ 2 files changed, 5 insertions(+)

diff --git a/js/src/tests/user.js b/js/src/tests/user.js index 8849221..694d4d0 100755 --- a/js/src/tests/user.js +++ b/js/src/tests/user.js @@ -27,3 +27,5 @@ user_pref("javascript.options.werror", false); user_pref("toolkit.startup.max_resumed_crashes", -1); user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true); user_pref("toolkit.telemetry.enabled", false); +user_pref("browser.safebrowsing.enabled", false); +user_pref("browser.safebrowsing.malware.enabled", false); diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py index 683b0a1..2bb3d11 100644 --- a/layout/tools/reftest/runreftest.py +++ b/layout/tools/reftest/runreftest.py @@ -74,6 +74,9 @@ class RefTest(object): # Ensure that telemetry is disabled, so we don't connect to the telemetry # server in the middle of the tests. prefsFile.write('user_pref("toolkit.telemetry.enabled", false);\n') + # Likewise for safebrowsing. + prefsFile.write('user_pref("browser.safebrowsing.enabled", false);\n') + prefsFile.write('user_pref("browser.safebrowsing.malware.enabled", false);\n')

for v in options.extraPrefs: thispref = v.split("=")