Backout 42f2ce6de0c7 (bug 1117979) for xpcshell orange
authorWes Kocher <wkocher@mozilla.com>
Fri, 09 Jan 2015 20:20:15 -0800
changeset 249038 8fbee3ef525f27acdd79aaeac834eea5f5d8cf6b
parent 249037 748361b75b03ba734fe5aebf265731eec98aa960
child 249039 76ca1c8d8baf354f52f04fa92a6b1951291ea76c
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1117979
milestone37.0a1
backs out42f2ce6de0c7fba747246e45df43eaeb945ba5f7
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
Backout 42f2ce6de0c7 (bug 1117979) for xpcshell orange
toolkit/components/search/tests/xpcshell/test_location_error.js
--- a/toolkit/components/search/tests/xpcshell/test_location_error.js
+++ b/toolkit/components/search/tests/xpcshell/test_location_error.js
@@ -15,20 +15,21 @@ function run_test() {
 
   do_get_file("data/engine.xml").copyTo(engineDir, "engine.xml");
 
   do_register_cleanup(function() {
     removeMetadata();
     removeCacheFile();
   });
 
-  // An unknown URL scheme will cause our error handler to be hit.
-  let url = "unknown-scheme://something";
+  // this will cause an "unknown host" error, but not report an external
+  // network connection in the tests (note that the hosts listed in
+  // server-locations.txt are *not* loaded for xpcshell tests...)
+  let url = "https://nocert.example.com:443";
   Services.prefs.setCharPref("browser.search.geoip.url", url);
-
   Services.search.init(() => {
     try {
       Services.prefs.getCharPref("browser.search.countryCode");
       ok(false, "not expecting countryCode to be set");
     } catch (ex) {}
     // should have an error recorded.
     checkCountryResultTelemetry(TELEMETRY_RESULT_ENUM.ERROR);
     // but false values for timeout and forced-sync-init.