Bug 1025959 - Disable checks for webapp updates during tests. r=jmaher, a=test-only
authorNathan Froyd <froydnj@mozilla.com>
Mon, 16 Jun 2014 11:47:05 -0400
changeset 208132 e4c1c3600a8008b4d75c89177c58b01400fc85eb
parent 208131 2380a4e88dca7a3bfc22691e1bf4d354dd000715
child 208133 bba11d5af195255aafcd479409cafd2ee9ec0841
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher, test-only
bugs1025959
milestone32.0a2
Bug 1025959 - Disable checks for webapp updates during tests. r=jmaher, a=test-only
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
@@ -23,8 +23,9 @@ user_pref("javascript.options.werror", f
 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);
+user_pref("browser.webapps.checkForUpdates", 0);
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -171,16 +171,18 @@ class RefTest(object):
     # 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
+    # And for webapp updates.  Yes, it is supposed to be an integer.
+    prefs['browser.webapps.checkForUpdates'] = 0
 
     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
@@ -170,16 +170,19 @@ user_pref("browser.webapps.testing", tru
 
 // 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);
 
+// Disable webapp updates.  Yes, it is supposed to be an integer.
+user_pref("browser.webapps.checkForUpdates", 0);
+
 // 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')