Bug 1024588 - turn off useragent updates for tests, to avoid hitting the network; r=jmaher
authorNathan Froyd <froydnj@mozilla.com>
Thu, 12 Jun 2014 15:14:43 -0400
changeset 188657 09d24ac458bbef8c4dfe53419ceaee25fde87da1
parent 188656 0b37d9e5112f119d9381e22cbd8a0366d982929d
child 188658 43735d7304278aa3dae85edf832dd1ef9b6242d8
push id26959
push userkwierso@gmail.com
push dateSat, 14 Jun 2014 00:01:00 +0000
treeherdermozilla-central@2fe61f417ec2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1024588
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1024588 - turn off useragent updates for tests, to avoid hitting the network; r=jmaher
js/src/tests/user.js
layout/tools/reftest/runreftest.py
testing/profiles/prefs_general.js
--- a/js/src/tests/user.js
+++ b/js/src/tests/user.js
@@ -22,8 +22,9 @@ user_pref("javascript.options.strict", f
 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);
 user_pref("browser.snippets.enabled", false);
 user_pref("browser.snippets.syncPromo.enabled", false);
+user_pref("general.useragent.updates.enabled", false);
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -169,16 +169,18 @@ class RefTest(object):
     # server in the middle of the tests.
     prefs['toolkit.telemetry.enabled'] = False
     # Likewise for safebrowsing.
     prefs['browser.safebrowsing.enabled'] = False
     prefs['browser.safebrowsing.malware.enabled'] = False
     # And for snippets.
     prefs['browser.snippets.enabled'] = False
     prefs['browser.snippets.syncPromo.enabled'] = False
+    # And for useragent updates.
+    prefs['general.useragent.updates.enabled'] = False
 
     if options.e10s:
       prefs['browser.tabs.remote.autostart'] = True
 
     for v in options.extraPrefs:
       thispref = v.split('=')
       if len(thispref) < 2:
         print "Error: syntax error in --setpref=" + v
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -167,16 +167,19 @@ user_pref("pbackground.testing", true);
 
 // Enable webapps testing mode, which bypasses native installation.
 user_pref("browser.webapps.testing", true);
 
 // Disable android snippets
 user_pref("browser.snippets.enabled", false);
 user_pref("browser.snippets.syncPromo.enabled", false);
 
+// Disable useragent updates.
+user_pref("general.useragent.updates.enabled", false);
+
 // Do not turn HTTP cache v2 for our infra tests (some tests are failing)
 user_pref("browser.cache.use_new_backend_temp", false);
 
 // Don't connect to Yahoo! for RSS feed tests.
 // en-US only uses .types.0.uri, but set all of them just to be sure.
 user_pref('browser.contentHandlers.types.0.uri', 'http://test1.example.org/rss?url=%%s')
 user_pref('browser.contentHandlers.types.1.uri', 'http://test1.example.org/rss?url=%%s')
 user_pref('browser.contentHandlers.types.2.uri', 'http://test1.example.org/rss?url=%%s')