Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1694521 - Part 4: In test_trr_flags, check that the channel actually used TRR if possible. r=valentin,necko-reviewers

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D106423
This commit is contained in:
Nihanth Subramanya 2021-03-21 20:20:36 +00:00
parent 909670d78f
commit 4b5d33266e
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netwerk/protocol/http/nsIHttpChannelInternal.idl
View File

@ -264,7 +264,7 @@ interface nsIHttpChannelInternal : nsISupports
* Is false for resources loaded from the cache or resources that have an
* IP literal host.
*/
[noscript, must_use] readonly attribute boolean isResolvedByTRR;
[must_use] readonly attribute boolean isResolvedByTRR;
/**
* Set to true if the channel is an OCSP check.

23
netwerk/test/unit/test_trr.js
View File

@ -110,7 +110,7 @@ add_task(async function test_trr_flags() {
const URL = `http://example.com:${httpserv.identity.primaryPort}/`;
for (let mode of [0, 1, 2, 3, 4, 5]) {
setModeAndURI(mode, "404");
setModeAndURI(mode, "doh?responseIP=127.0.0.1");
for (let flag of [
Ci.nsIRequest.TRR_DEFAULT_MODE,
Ci.nsIRequest.TRR_DISABLED_MODE,
@ -119,17 +119,22 @@ add_task(async function test_trr_flags() {
]) {
dns.clearCache(true);
let chan = makeChan(URL, flag);
let channelFlags;
if (
([0, 2, 3].includes(mode) && flag == Ci.nsIRequest.TRR_ONLY_MODE) ||
(mode == 3 && flag == Ci.nsIRequest.TRR_DEFAULT_MODE)
) {
channelFlags = CL_EXPECT_FAILURE;
}
let expectTRR =
([2, 3].includes(mode) && flag != Ci.nsIRequest.TRR_DISABLED_MODE) ||
(mode == 0 &&
[Ci.nsIRequest.TRR_FIRST_MODE, Ci.nsIRequest.TRR_ONLY_MODE].includes(
flag
));
await new Promise(resolve =>
chan.asyncOpen(new ChannelListener(resolve, null, channelFlags))
chan.asyncOpen(new ChannelListener(resolve))
);
equal(chan.getTRRMode(), flag);
equal(
expectTRR,
chan.QueryInterface(Ci.nsIHttpChannelInternal).isResolvedByTRR
);
}
}