Bug 1460232 - Update search test to handle missing region. r?adw draft
authorMichael Kaply <mozilla@kaply.com>
Wed, 09 May 2018 13:17:11 -0700
changeset 793295 4aa8cf5c8b0f2fb3579a5ef2c0f77fec78a30118
parent 793238 76aad17f5b50a1b969eec8cbb5aa9875555640bc
child 793471 f478a24968678f43cd43da42c1d8444d92473070
push id109337
push usermozilla@kaply.com
push dateWed, 09 May 2018 20:17:24 +0000
reviewersadw
bugs1460232
milestone62.0a1
Bug 1460232 - Update search test to handle missing region. r?adw MozReview-Commit-ID: 7TSFXGJcr52
toolkit/components/search/tests/xpcshell/head_search.js
--- a/toolkit/components/search/tests/xpcshell/head_search.js
+++ b/toolkit/components/search/tests/xpcshell/head_search.js
@@ -241,17 +241,18 @@ function getDefaultEngineName(isUS) {
     loadUsingSystemPrincipal: true
   });
   let searchSettings = parseJsonFromStream(chan.open2());
   let defaultEngineName = searchSettings.default.searchDefault;
 
   if (isUS === undefined)
     isUS = Services.locale.getRequestedLocale() == "en-US" && isUSTimezone();
 
-  if (isUS && ("searchDefault" in searchSettings.US)) {
+  if (isUS && ("US" in searchSettings &&
+               "searchDefault" in searchSettings.US)) {
     defaultEngineName = searchSettings.US.searchDefault;
   }
   return defaultEngineName;
 }
 
 /**
  * Waits for the cache file to be saved.
  * @return {Promise} Resolved when the cache file is saved.