Bug 1531920 - Unlock our prefs while cleaning up; r=ewright
☠☠ backed out by d04770626762 ☠ ☠
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 07 May 2019 16:16:15 +0000
changeset 534799 264bdfcb9ebb54017a4abc88b870def85e486de8
parent 534798 40dad5764be780d7f1cae6e79075923386bd82f5
child 534800 28fa627eb8e9b430526a1d8d302e0ccdaef22d73
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersewright
bugs1531920
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1531920 - Unlock our prefs while cleaning up; r=ewright Differential Revision: https://phabricator.services.mozilla.com/D30112
browser/components/preferences/in-content/tests/browser_contentblocking.js
--- a/browser/components/preferences/in-content/tests/browser_contentblocking.js
+++ b/browser/components/preferences/in-content/tests/browser_contentblocking.js
@@ -461,16 +461,22 @@ add_task(async function testPolicyCatego
   let standardRadioOption = doc.getElementById("standardRadio");
   is(strictRadioOption.disabled, true, "the strict option is disabled");
   is(standardRadioOption.disabled, true, "the standard option is disabled");
 
   gBrowser.removeCurrentTab();
 
   // Cleanup after this particular test.
   if (Services.policies.status != Ci.nsIEnterprisePolicies.INACTIVE) {
+    await EnterprisePolicyTesting.setupPolicyEngineWithJson({
+      policies: {"Cookies": {
+	  "Locked": false,
+	},
+      },
+    });
     await EnterprisePolicyTesting.setupPolicyEngineWithJson("");
   }
   is(Services.policies.status, Ci.nsIEnterprisePolicies.INACTIVE, "Engine is inactive at the end of the test");
 
   EnterprisePolicyTesting.resetRunOnceState();
   PoliciesPrefTracker.stop();
 });