Bug 1123972 - Up search geo timeout to 3 seconds. r=florian
authorMichael Kaply <mozilla@kaply.com>
Fri, 23 Sep 2016 15:33:58 -0500
changeset 315299 aa5a378b17f161744b473d85070ffdafb428d825
parent 315298 ff3538fd40fe3daf3855963fd1273543165fe409
child 315300 0bbbaab0e95de835cdc0fd60c753ee6f6406f0df
push id30747
push usercbook@mozilla.com
push dateTue, 27 Sep 2016 09:22:00 +0000
treeherdermozilla-central@66a77b9bfe5d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflorian
bugs1123972
milestone52.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 1123972 - Up search geo timeout to 3 seconds. r=florian MozReview-Commit-ID: 71olvznwLrr
modules/libpref/init/all.js
toolkit/components/search/tests/xpcshell/head_search.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5351,19 +5351,17 @@ pref("browser.search.log", false);
 pref("browser.search.update", true);
 pref("browser.search.update.log", false);
 pref("browser.search.update.interval", 21600);
 pref("browser.search.suggest.enabled", true);
 pref("browser.search.reset.enabled", false);
 pref("browser.search.reset.whitelist", "");
 pref("browser.search.geoSpecificDefaults", false);
 pref("browser.search.geoip.url", "https://location.services.mozilla.com/v1/country?key=%MOZILLA_API_KEY%");
-// NOTE: this timeout figure is also the "high" value for the telemetry probe
-// SEARCH_SERVICE_COUNTRY_FETCH_MS - if you change this also change that probe.
-pref("browser.search.geoip.timeout", 2000);
+pref("browser.search.geoip.timeout", 3000);
 
 #ifdef MOZ_OFFICIAL_BRANDING
 // {moz:official} expands to "official"
 pref("browser.search.official", true);
 #endif
 
 #ifndef MOZ_WIDGET_GONK
 // GMPInstallManager prefs
--- a/toolkit/components/search/tests/xpcshell/head_search.js
+++ b/toolkit/components/search/tests/xpcshell/head_search.js
@@ -339,17 +339,17 @@ function isSubObjectOf(expectedObj, actu
 // doesn't run in child processes anyways.
 if (!isChild) {
   // Expand the amount of information available in error logs
   Services.prefs.setBoolPref("browser.search.log", true);
 
   // The geo-specific search tests assume certain prefs are already setup, which
   // might not be true when run in comm-central etc.  So create them here.
   Services.prefs.setBoolPref("browser.search.geoSpecificDefaults", true);
-  Services.prefs.setIntPref("browser.search.geoip.timeout", 2000);
+  Services.prefs.setIntPref("browser.search.geoip.timeout", 3000);
   // But still disable geoip lookups - tests that need it will re-configure this.
   Services.prefs.setCharPref("browser.search.geoip.url", "");
   // Also disable region defaults - tests using it will also re-configure it.
   Services.prefs.getDefaultBranch(BROWSER_SEARCH_PREF).setCharPref("geoSpecificDefaults.url", "");
 }
 
 /**
  * After useHttpServer() is called, this string contains the URL of the "data"