Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 25 insertions, 5 deletions

diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_corrupt.js b/toolkit/mozapps/extensions/test/xpcshell/test_corrupt.js
index 727c643763..33e81c13bd 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_corrupt.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_corrupt.js
@@ -196,7 +196,7 @@ add_task(async function test_after_corruption() {
 
   await Assert.rejects(
     promiseShutdownManager(),
-    /NotAllowedError: Could not open the file at .+ for writing/
+    /NotAllowedError: Could not write to `.+'/
   );
 });
 
@@ -211,6 +211,6 @@ add_task(async function test_after_second_restart() {
 
   await Assert.rejects(
     promiseShutdownManager(),
-    /NotAllowedError: Could not open the file at .+ for writing/
+    /NotAllowedError: Could not write to `.+'/
   );
 });
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_system_update_enterprisepolicy.js b/toolkit/mozapps/extensions/test/xpcshell/test_system_update_enterprisepolicy.js
index d36b97a3cc..e25890515f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_system_update_enterprisepolicy.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_system_update_enterprisepolicy.js
@@ -44,12 +44,32 @@ const TEST_CONDITIONS = {
 add_task(async function test_update_disabled_by_policy() {
   await setupSystemAddonConditions(TEST_CONDITIONS, distroDir);
 
+  const TEST_POLICY_DATA = {
+    DisableSystemAddonUpdate: true,
+  };
   await EnterprisePolicyTesting.setupPolicyEngineWithJson({
-    policies: {
-      DisableSystemAddonUpdate: true,
-    },
+    policies: TEST_POLICY_DATA,
   });
 
+  Assert.deepEqual(
+    Services.policies.getActivePolicies(),
+    TEST_POLICY_DATA,
+    "Got the expected test policy data as the active policy " +
+      "(if this assertions fails, check your system for enterprise policies installed at system level)"
+  );
+
+  Assert.equal(
+    Services.policies.isAllowed("SysAddonUpdate"),
+    false,
+    "Expected SysAddonUpdate feature to be disabled by policies"
+  );
+
+  Assert.equal(
+    Services.prefs.getBoolPref("extensions.systemAddon.update.enabled"),
+    true,
+    "Expected system addon updates to not be already disabled through prefs"
+  );
+
   await updateAllSystemAddons(
     buildSystemAddonUpdates([
       {