mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1585748 - Update test_trr.js to account for network.trr.request-timeout being renamed r=agrover 

Differential Revision: https://phabricator.services.mozilla.com/D47965

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Valentin Gosu 2019-10-02 20:47:05 +00:00
Родитель b01dc0a82e
Коммит 69224531f0
2 изменённых файлов: 15 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
modules/libpref/init/all.js
Просмотреть файл

@ -4212,7 +4212,7 @@ pref("network.connectivity-service.IPv4.url", "http://detectportal.firefox.com/s
pref("network.connectivity-service.IPv6.url", "http://detectportal.firefox.com/success.txt?ipv6");
// DNS Trusted Recursive Resolver
// 0 - default off, 1 - race, 2 TRR first, 3 TRR only, 4 shadow, 5 off by choice
// 0 - default off, 1 - reserved/off, 2 - TRR first, 3 - TRR only, 4 - reserved/off, 5 off by choice
pref("network.trr.mode", 0);
// DNS-over-HTTP service to use, must be HTTPS://
pref("network.trr.uri", "https://mozilla.cloudflare-dns.com/dns-query");

20
netwerk/test/unit/test_trr.js
Просмотреть файл

@ -78,7 +78,8 @@ registerCleanupFunction(() => {
Services.prefs.clearUserPref("network.trr.confirmationNS");
Services.prefs.clearUserPref("network.trr.bootstrapAddress");
Services.prefs.clearUserPref("network.trr.blacklist-duration");
Services.prefs.clearUserPref("network.trr.request-timeout");
Services.prefs.clearUserPref("network.trr.request_timeout_ms");
Services.prefs.clearUserPref("network.trr.request_timeout_mode_trronly_ms");
Services.prefs.clearUserPref("network.trr.disable-ECS");
Services.prefs.clearUserPref("network.trr.early-AAAA");
Services.prefs.clearUserPref("network.trr.skip-AAAA-when-not-supported");
@ -479,7 +480,7 @@ add_task(async function test11() {
"network.trr.uri",
`https://foo.example.com:${h2Port}/dns-750ms`
);
Services.prefs.setIntPref("network.trr.request-timeout", 10);
Services.prefs.setIntPref("network.trr.request_timeout_mode_trronly_ms", 10);
let [, , inStatus] = await new DNSListener(
"test11.example.com",
undefined,
@ -495,11 +496,13 @@ add_task(async function test11() {
add_task(async function test12() {
dns.clearCache(true);
Services.prefs.setIntPref("network.trr.mode", 2); // TRR-first
Services.prefs.setIntPref("network.trr.request_timeout_ms", 10);
Services.prefs.setCharPref(
"network.trr.uri",
`https://foo.example.com:${h2Port}/doh?responseIP=none`
);
Services.prefs.clearUserPref("network.trr.request-timeout");
Services.prefs.clearUserPref("network.trr.request_timeout_ms");
Services.prefs.clearUserPref("network.trr.request_timeout_mode_trronly_ms");
await new DNSListener("confirm.example.com", "127.0.0.1");
});
@ -540,7 +543,8 @@ add_task(async function test15() {
"network.trr.uri",
`https://foo.example.com:${h2Port}/dns-750ms`
);
Services.prefs.setIntPref("network.trr.request-timeout", 10);
Services.prefs.setIntPref("network.trr.request_timeout_ms", 10);
Services.prefs.setIntPref("network.trr.request_timeout_mode_trronly_ms", 10);
await new DNSListener("test15.example.com", "127.0.0.1");
Services.prefs.setIntPref("network.trr.mode", 4); // MODE_RESERVED4. Interpreted as TRR off.
@ -559,7 +563,8 @@ add_task(async function test16() {
"network.trr.uri",
`https://foo.example.com:${h2Port}/dns-750ms`
);
Services.prefs.setIntPref("network.trr.request-timeout", 10);
Services.prefs.setIntPref("network.trr.request_timeout_ms", 10);
Services.prefs.setIntPref("network.trr.request_timeout_mode_trronly_ms", 10);
await new DNSListener("test16.example.com", "127.0.0.1");
});
@ -571,7 +576,8 @@ add_task(async function test17() {
"network.trr.uri",
`https://foo.example.com:${h2Port}/dns-cname`
);
Services.prefs.clearUserPref("network.trr.request-timeout");
Services.prefs.clearUserPref("network.trr.request_timeout_ms");
Services.prefs.clearUserPref("network.trr.request_timeout_mode_trronly_ms");
await new DNSListener("cname.example.com", "99.88.77.66");
});
@ -921,6 +927,8 @@ add_task(async function test_connection_closed() {
dns.clearCache(true);
Services.prefs.setIntPref("network.trr.mode", 3); // TRR-only
Services.prefs.setCharPref("network.trr.excluded-domains", "");
// We don't need to wait for 30 seconds for the request to fail
Services.prefs.setIntPref("network.trr.request_timeout_mode_trronly_ms", 500);
Services.prefs.setCharPref(
"network.trr.uri",
`https://foo.example.com:${h2Port}/doh?responseIP=2.2.2.2`