Bug 1694521 - Part 5: Clean up test_AAAA_records. r=valentin,necko-re…

…viewers The wait-for-A-and-AAAA and early-AAAA prefs were removed. Differential Revision: https://phabricator.services.mozilla.com/D106424
dothq · Feb 26, 2021 · c9df4a4 · c9df4a4
1 parent 4024907
commit c9df4a4
Showing 1 changed file with 0 additions and 59 deletions.
diff --git a/netwerk/test/unit/test_trr.js b/netwerk/test/unit/test_trr.js
@@ -209,80 +209,21 @@ add_task(async function test_push() {
 
 add_task(async function test_AAAA_records() {
   info("Verifying AAAA record");
-  Services.prefs.setBoolPref("network.trr.wait-for-A-and-AAAA", true);
 
   dns.clearCache(true);
-  Services.prefs.setBoolPref("network.trr.early-AAAA", true); // ignored when wait-for-A-and-AAAA is true
   setModeAndURI(3, "doh?responseIP=2020:2020::2020&delayIPv4=100");
 
   await new TRRDNSListener("aaaa.example.com", "2020:2020::2020");
 
   dns.clearCache(true);
-  Services.prefs.setBoolPref("network.trr.early-AAAA", false); // ignored when wait-for-A-and-AAAA is true
-  setModeAndURI(3, "doh?responseIP=2020:2020::2030&delayIPv4=100");
-
-  await new TRRDNSListener("aaaa.example.com", "2020:2020::2030");
-
-  dns.clearCache(true);
-  Services.prefs.setBoolPref("network.trr.early-AAAA", true); // ignored when wait-for-A-and-AAAA is true
   setModeAndURI(3, "doh?responseIP=2020:2020::2020&delayIPv6=100");
 
   await new TRRDNSListener("aaaa.example.com", "2020:2020::2020");
 
   dns.clearCache(true);
-  Services.prefs.setBoolPref("network.trr.early-AAAA", false); // ignored when wait-for-A-and-AAAA is true
-  setModeAndURI(3, "doh?responseIP=2020:2020::2030&delayIPv6=100");
-
-  await new TRRDNSListener("aaaa.example.com", "2020:2020::2030");
-
-  dns.clearCache(true);
-  Services.prefs.setBoolPref("network.trr.early-AAAA", true); // ignored when wait-for-A-and-AAAA is true
   setModeAndURI(3, "doh?responseIP=2020:2020::2020");
 
   await new TRRDNSListener("aaaa.example.com", "2020:2020::2020");
-
-  dns.clearCache(true);
-  Services.prefs.setBoolPref("network.trr.early-AAAA", false); // ignored when wait-for-A-and-AAAA is true
-  setModeAndURI(3, "doh?responseIP=2020:2020::2030");
-
-  await new TRRDNSListener("aaaa.example.com", "2020:2020::2030");
-
-  Services.prefs.setBoolPref("network.trr.wait-for-A-and-AAAA", false);
-
-  dns.clearCache(true);
-  Services.prefs.setBoolPref("network.trr.early-AAAA", true);
-  setModeAndURI(3, "doh?responseIP=2020:2020::2020&delayIPv4=100");
-
-  await new TRRDNSListener("aaaa.example.com", "2020:2020::2020");
-
-  dns.clearCache(true);
-  Services.prefs.setBoolPref("network.trr.early-AAAA", false);
-  setModeAndURI(3, "doh?responseIP=2020:2020::2030&delayIPv4=100");
-  await new TRRDNSListener("aaaa.example.com", "2020:2020::2030");
-
-  dns.clearCache(true);
-  Services.prefs.setBoolPref("network.trr.early-AAAA", true);
-  setModeAndURI(3, "doh?responseIP=2020:2020::2020&delayIPv6=100");
-
-  await new TRRDNSListener("aaaa.example.com", "2020:2020::2020");
-
-  dns.clearCache(true);
-  Services.prefs.setBoolPref("network.trr.early-AAAA", false);
-  setModeAndURI(3, "doh?responseIP=2020:2020::2030&delayIPv6=100");
-  await new TRRDNSListener("aaaa.example.com", "2020:2020::2030");
-
-  dns.clearCache(true);
-  Services.prefs.setBoolPref("network.trr.early-AAAA", true);
-  setModeAndURI(3, "doh?responseIP=2020:2020::2020");
-  await new TRRDNSListener("aaaa.example.com", "2020:2020::2020");
-
-  dns.clearCache(true);
-  Services.prefs.setBoolPref("network.trr.early-AAAA", false);
-  setModeAndURI(3, "doh?responseIP=2020:2020::2030");
-  await new TRRDNSListener("aaaa.example.com", "2020:2020::2030");
-
-  Services.prefs.clearUserPref("network.trr.early-AAAA");
-  Services.prefs.clearUserPref("network.trr.wait-for-A-and-AAAA");
 });
 
 add_task(async function test_RFC1918() {