04:41:13 WARNING - TEST-UNEXPECTED-FAIL | toolkit/components/search/tests/xpcshell/test_location_sync.js | test_simple - [test_simple : 57] isUS pref was set by sync init. - "undefined" deepEqual true 04:41:13 INFO - /builds/slave/test/build/tests/xpcshell/tests/toolkit/components/search/tests/xpcshell/test_location_sync.js:test_simple:57 04:41:13 INFO - self-hosted:next:913 04:41:13 INFO - _run_next_test@/builds/slave/test/build/tests/xpcshell/head.js:1347:9 04:41:13 INFO - do_execute_soon/<.run@/builds/slave/test/build/tests/xpcshell/head.js:616:9 04:41:13 INFO - _do_main@/builds/slave/test/build/tests/xpcshell/head.js:184:5 04:41:13 INFO - _execute_test@/builds/slave/test/build/tests/xpcshell/head.js:476:5 04:41:13 INFO - @-e:1:1 04:41:13 INFO - exiting test 04:41:13 INFO - (xpcshell/head.js) | test run_next_test 0 finished (2) 04:41:13 INFO - Unexpected exception 2147500036 04:41:13 INFO - undefined 04:41:13 INFO - exiting test 04:41:13 INFO - <<<<<<< 04:41:13 INFO - TEST-START | toolkit/components/search/tests/xpcshell/test_location.js 04:46:13 WARNING - TEST-UNEXPECTED-TIMEOUT | toolkit/components/search/tests/xpcshell/test_location.js | Test timed out

Some tests added by bug1109120 rely on preference values in firefox.js. Those should be independent firefox.js. Try on mozilla-central https://treeherder.mozilla.org/#/jobs?repo=try&revision=149aa387ff45 Try on comm-central https://treeherder.mozilla.org/ui/#/jobs?repo=try-comm-central&revision=bf22f37cdb05

Comment on attachment 8541467 [details] [diff] [review] bug1115440.patch Review of attachment 8541467 [details] [diff] [review]: ----------------------------------------------------------------- Thanks! But this patch is in the wrong format - it is adding a .patch file to the repo which isn't what we want. However, I think a slightly better approach would be to add those 2 new prefs to head_search.js with a comment - something like: --- a/toolkit/components/search/tests/xpcshell/head_search.js +++ b/toolkit/components/search/tests/xpcshell/head_search.js @@ -205,7 +205,11 @@ function isSubObjectOf(expectedObj, actualObj) { // Expand the amount of information available in error logs Services.prefs.setBoolPref("browser.search.log", true); -// Disable geoip lookups +// 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); +// But still disable geoip lookups - tests that need it will re-configure this. Services.prefs.setCharPref("browser.search.geoip.url", ""); (Note there's no need to reset these prefs given how xpcshell tests work.) If you can give this a try run and resubmit the patch in the correct format I'll r+ it!

Revised. https://treeherder.mozilla.org/#/jobs?repo=try&revision=31b45d24253b Thanks for reviewing!

Thanks markh!