Bug 1272381 - ensure useragent-update-complete listener is added before updating prefs. r?valentin
MozReview-Commit-ID: 4JNz1catGGK
--- a/netwerk/test/mochitests/test_user_agent_updates.html
+++ b/netwerk/test/mochitests/test_user_agent_updates.html
@@ -128,26 +128,16 @@ function getUpdateURL() {
}
function testDownload(callback) {
var startTime = Date.now();
var url = getUpdateURL();
isnot(navigator.userAgent, UA_OVERRIDE, 'UA already overridden');
info('Waiting for UA update: ' + url);
- chromeScript.sendAsyncMessage("notify-on-update");
- SpecialPowers.pushPrefEnv({
- set: [
- [PREF_UPDATES_ENABLED, true],
- [PREF_UPDATES_URL, url],
- [PREF_UPDATES_TIMEOUT, 10000],
- [PREF_UPDATES_INTERVAL, 1] // 1 second interval
- ]
- });
-
function waitForUpdate() {
info("Update Happened");
testUAIFrameNoNav(location.origin, UA_OVERRIDE, true, 'Header UA not overridden', function() {
var updateTime = parseInt(getUA('http://example.org'));
todo(startTime <= updateTime, 'Update was before start time');
todo(updateTime <= Date.now(), 'Update was after present time');
let overs = OVERRIDES;
@@ -160,16 +150,26 @@ function testDownload(callback) {
} else {
nextOverride();
}
})();
});
}
chromeScript.addMessageListener("useragent-update-complete", waitForUpdate);
+
+ chromeScript.sendAsyncMessage("notify-on-update");
+ SpecialPowers.pushPrefEnv({
+ set: [
+ [PREF_UPDATES_ENABLED, true],
+ [PREF_UPDATES_URL, url],
+ [PREF_UPDATES_TIMEOUT, 10000],
+ [PREF_UPDATES_INTERVAL, 1] // 1 second interval
+ ]
+ });
}
function testBadUpdate(callback) {
var url = getServerURL() + 'invalid-json';
var prevOverride = navigator.userAgent;
SpecialPowers.pushPrefEnv({
set: [
[PREF_UPDATES_URL, url],