Backed out changeset b2027d7f6480 (bug 1605297) for failures in browser_cleanFlow.js CLOSED TREE

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

@@ -1,8 +1,6 @@
 "use strict";
 
 add_task(async function testCleanFlow() {
-  await waitForBalrogMigration();
-
   // Set up a passing environment and enable DoH.
   setPassingHeuristics();
   let promise = waitForDoorhanger();

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

@@ -1,8 +1,6 @@
 "use strict";
 
 add_task(async function testDirtyEnable() {
-  await waitForBalrogMigration();
-
   // Set up a failing environment, pre-set DoH to enabled, and verify that
   // when the add-on is enabled, it doesn't do anything - DoH remains turned on.
   setFailingHeuristics();

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

@@ -1,8 +1,6 @@
 "use strict";
 
 add_task(async function testDoorhangerUserReject() {
-  await waitForBalrogMigration();
-
   // Set up a passing environment and enable DoH.
   setPassingHeuristics();
   let promise = waitForDoorhanger();

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

@@ -6,8 +6,6 @@ const { EnterprisePolicyTesting } = ChromeUtils.import(
 );
 
 add_task(async function testPolicyOverride() {
-  await waitForBalrogMigration();
-
   // Set up an arbitrary enterprise policy. Its existence should be sufficient
   // to disable heuristics.
   await EnterprisePolicyTesting.setupPolicyEngineWithJson({

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

@@ -1,8 +1,6 @@
 "use strict";
 
 add_task(async function testUserInterference() {
-  await waitForBalrogMigration();
-
   // Set up a passing environment and enable DoH.
   setPassingHeuristics();
   let promise = waitForDoorhanger();

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

@@ -63,17 +63,6 @@ function setFailingHeuristics() {
   Preferences.set(prefs.MOCK_HEURISTICS_PREF, fakeFailingHeuristics);
 }
 
-async function waitForBalrogMigration() {
-  await BrowserTestUtils.waitForCondition(() => {
-    return Preferences.get(prefs.DOH_BALROG_MIGRATION_PREF, false);
-  });
-  is(
-    Preferences.get(prefs.DOH_BALROG_MIGRATION_PREF, false),
-    true,
-    "Balrog migration is complete and pref is set."
-  );
-}
-
 async function restartAddon() {
   let addon = await AddonManager.getAddonByID(ADDON_ID);
   await addon.reload();