Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1295680: Fix test race for image loading requests. r=mao

Browse Source 
MozReview-Commit-ID: DTJTOFTKWna

--HG--
extra : rebase_source : 2b07be60c656d3406f7c1ee6fcadafc39112c38a
This commit is contained in:
Kris Maglione 2016-10-04 23:08:40 +01:00
parent 9174046b25
commit 2bbdafeca8
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
toolkit/components/extensions/test/mochitest/test_ext_webrequest.html
View File

@ -152,6 +152,7 @@ function backgroundScript() {
let frameIDs = new Map();
let skippedRequests = new Set();
let redirectedRequests = new Set();
let recorded = {requested: [],
beforeSendHeaders: [],
@ -368,6 +369,7 @@ function backgroundScript() {
browser.test.assertEq(id, details.frameId, "frame ID same in onBeforeSendHeaders as onBeforeRequest");
}
if (details.url.includes("_redirect.")) {
redirectedRequests.add(details.requestId);
return {redirectUrl: details.url.replace("_redirect.", "_good.")};
}
return {requestHeaders: details.requestHeaders};
@ -449,8 +451,16 @@ function backgroundScript() {
}
function onErrorOccurred(details) {
onRecord("error", details);
browser.test.assertTrue(/^NS_ERROR_/.test(details.error), `onErrorOccurred reported for ${details.url} (${details.error})`);
if (details.url.endsWith("_good.png") && redirectedRequests.has(details.requestId)) {
// Redirected image requests sometimes result in multiple attempts to
// load the same image in parallel. In this case, the later request is
// canceled, and the same image loading context is shared by both images.
redirectedRequests.delete(details.requestId);
browser.test.assertEq("NS_BINDING_ABORTED", details.error, `onErrorOccurred reported for ${details.url}`);
} else {
onRecord("error", details);
browser.test.assertTrue(/^NS_ERROR_/.test(details.error), `onErrorOccurred reported for ${details.url} (${details.error})`);
}
}
function onCompleted(details) {
@ -498,11 +508,12 @@ function* test_once(skipCompleted) {
"webRequestBlocking",
],
},
background: `const BASE = ${JSON.stringify(BASE)}; (${backgroundScript.toString()})()`,
background: `const BASE = ${JSON.stringify(BASE)}; (${backgroundScript})()`,
};
let extension = ExtensionTestUtils.loadExtension(extensionData);
let [, resourceTypes] = yield Promise.all([extension.startup(), extension.awaitMessage("ready")]);
yield extension.startup();
let resourceTypes = yield extension.awaitMessage("ready");
info("webrequest extension loaded");
if (skipCompleted) {