Bug 1631609 - Use an actual URI for dummy TRR in tests. r=johannh,valentin

This ensures we can check gDNSService.currentTrrURI

Depends on D76617

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

browser/extensions/doh-rollout/experiments/trrselect/api.js

@@ -52,7 +52,7 @@ this.trrselect = class trrselect extends ExtensionAPI {
             if (Cu.isInAutomation) {
               // For mochitests, just record telemetry with a dummy result.
               // TRRPerformance.jsm is tested in xpcshell.
-              setDryRunResultAndRecordTelemetry("dummyTRR");
+              setDryRunResultAndRecordTelemetry("https://dummytrr.com/query");
               return;
             }
 

browser/extensions/doh-rollout/test/browser/browser_cleanFlow.js

@@ -13,7 +13,7 @@ add_task(async function testCleanFlow() {
   is(Preferences.get(prefs.DOH_SELF_ENABLED_PREF), true, "Breadcrumb saved.");
   is(
     Preferences.get(prefs.DOH_TRR_SELECT_URI_PREF),
-    "dummyTRR",
+    "https://dummytrr.com/query",
     "TRR selection complete."
   );
   await checkTRRSelectionTelemetry();

browser/extensions/doh-rollout/test/browser/browser_doorhangerUserReject.js

@@ -13,7 +13,7 @@ add_task(async function testDoorhangerUserReject() {
   is(Preferences.get(prefs.DOH_SELF_ENABLED_PREF), true, "Breadcrumb saved.");
   is(
     Preferences.get(prefs.DOH_TRR_SELECT_URI_PREF),
-    "dummyTRR",
+    "https://dummytrr.com/query",
     "TRR selection complete."
   );
   await checkTRRSelectionTelemetry();

browser/extensions/doh-rollout/test/browser/browser_doorhanger_newProfile.js

@@ -16,7 +16,7 @@ add_task(async function testDoorhanger() {
   is(Preferences.get(prefs.DOH_SELF_ENABLED_PREF), true, "Breadcrumb saved.");
   is(
     Preferences.get(prefs.DOH_TRR_SELECT_URI_PREF),
-    "dummyTRR",
+    "https://dummytrr.com/query",
     "TRR selection complete."
   );
   await checkTRRSelectionTelemetry();

browser/extensions/doh-rollout/test/browser/browser_rollback.js

@@ -15,7 +15,7 @@ add_task(async function testRollback() {
   is(Preferences.get(prefs.DOH_SELF_ENABLED_PREF), true, "Breadcrumb saved.");
   is(
     Preferences.get(prefs.DOH_TRR_SELECT_URI_PREF),
-    "dummyTRR",
+    "https://dummytrr.com/query",
     "TRR selection complete."
   );
   await checkTRRSelectionTelemetry();

browser/extensions/doh-rollout/test/browser/browser_trrSelect.js

@@ -10,11 +10,11 @@ add_task(async function testTRRSelect() {
     .getDefaultBranch("")
     .setCharPref(
       "network.trr.resolvers",
-      `[{"url": "dummyTRR"}, {"url": "dummyTRR2"}]`
+      `[{"url": "https://dummytrr.com/query"}, {"url": "https://dummytrr2.com/query"}]`
     );
   Services.prefs.setCharPref(
     "network.trr.resolvers",
-    `[{"url": "dummyTRR"}, {"url": "dummyTRR2"}, {"url": "dummyTRR3"}]`
+    `[{"url": "https://dummytrr.com/query"}, {"url": "https://dummytrr2.com/query"}, {"url": "https://dummytrr3.com/query"}]`
   );
 
   // Clean start: doh-rollout.uri should be set after init.
@@ -26,7 +26,7 @@ add_task(async function testTRRSelect() {
   is(Preferences.get(prefs.DOH_SELF_ENABLED_PREF), true, "Breadcrumb saved.");
   is(
     Preferences.get(prefs.DOH_TRR_SELECT_URI_PREF),
-    "dummyTRR",
+    "https://dummytrr.com/query",
     "TRR selection complete."
   );
 
@@ -43,7 +43,7 @@ add_task(async function testTRRSelect() {
   });
   is(
     Preferences.get(prefs.DOH_TRR_SELECT_URI_PREF),
-    "dummyTRR",
+    "https://dummytrr.com/query",
     "TRR selection complete."
   );
 
@@ -67,7 +67,7 @@ add_task(async function testTRRSelect() {
   }
   is(
     Preferences.get(prefs.DOH_TRR_SELECT_DRY_RUN_RESULT_PREF),
-    "dummyTRR",
+    "https://dummytrr.com/query",
     "TRR selection complete, dry-run result recorded."
   );
   Preferences.set(prefs.DOH_TRR_SELECT_COMMIT_PREF, true);
@@ -79,14 +79,17 @@ add_task(async function testTRRSelect() {
   // Reset doh-rollout.uri, and change the dry-run-result to another one on the
   // default list. After init, the existing dry-run-result should be committed.
   Preferences.reset(prefs.DOH_TRR_SELECT_URI_PREF);
-  Preferences.set(prefs.DOH_TRR_SELECT_DRY_RUN_RESULT_PREF, "dummyTRR2");
+  Preferences.set(
+    prefs.DOH_TRR_SELECT_DRY_RUN_RESULT_PREF,
+    "https://dummytrr2.com/query"
+  );
   await restartAddon();
   await BrowserTestUtils.waitForCondition(() => {
     return Preferences.get(prefs.DOH_TRR_SELECT_URI_PREF);
   });
   is(
     Preferences.get(prefs.DOH_TRR_SELECT_URI_PREF),
-    "dummyTRR2",
+    "https://dummytrr2.com/query",
     "TRR selection complete, existing dry-run-result committed."
   );
 
@@ -97,14 +100,17 @@ add_task(async function testTRRSelect() {
   // Reset doh-rollout.uri, and change the dry-run-result to another one NOT on
   // default list. After init, a new TRR should be selected and committed.
   Preferences.reset(prefs.DOH_TRR_SELECT_URI_PREF);
-  Preferences.set(prefs.DOH_TRR_SELECT_DRY_RUN_RESULT_PREF, "dummyTRR3");
+  Preferences.set(
+    prefs.DOH_TRR_SELECT_DRY_RUN_RESULT_PREF,
+    "https://dummytrr3.com/query"
+  );
   await restartAddon();
   await BrowserTestUtils.waitForCondition(() => {
     return Preferences.get(prefs.DOH_TRR_SELECT_URI_PREF);
   });
   is(
     Preferences.get(prefs.DOH_TRR_SELECT_URI_PREF),
-    "dummyTRR",
+    "https://dummytrr.com/query",
     "TRR selection complete, existing dry-run-result discarded and refreshed."
   );
 

browser/extensions/doh-rollout/test/browser/browser_userInterference.js

@@ -13,7 +13,7 @@ add_task(async function testUserInterference() {
   is(Preferences.get(prefs.DOH_SELF_ENABLED_PREF), true, "Breadcrumb saved.");
   is(
     Preferences.get(prefs.DOH_TRR_SELECT_URI_PREF),
-    "dummyTRR",
+    "https://dummytrr.com/query",
     "TRR selection complete."
   );
   await checkTRRSelectionTelemetry();

browser/extensions/doh-rollout/test/browser/head.js

@@ -125,7 +125,11 @@ async function checkTRRSelectionTelemetry() {
       e[3] == "dryrunresult"
   );
   is(events.length, 1, "Found the expected trrselect event.");
-  is(events[0][4], "dummyTRR", "The event records the expected decision");
+  is(
+    events[0][4],
+    "https://dummytrr.com/query",
+    "The event records the expected decision"
+  );
 }
 
 function ensureNoTRRSelectionTelemetry() {