Merging upstream version 126.0.

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

1 files changed, 12 insertions, 11 deletions

diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_hash2.js b/toolkit/mozapps/extensions/test/xpinstall/browser_hash2.js
index 9fd0c66292..e7779792ac 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_hash2.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_hash2.js
@@ -1,12 +1,17 @@
 // ----------------------------------------------------------------------------
 // Test whether an install succeeds using case-insensitive hashes
 // This verifies bug 603021
-function test() {
+add_task(async function test_install_hash_case_insensitive() {
   // This test currently depends on InstallTrigger.install availability.
   setInstallTriggerPrefs();
 
-  Harness.installEndedCallback = install_ended;
-  Harness.installsCompletedCallback = finish_test;
+  const xpiFilePath = getTestFilePath("./amosigned.xpi");
+  const xpiFileHash = await IOUtils.computeHexDigest(xpiFilePath, "sha256");
+
+  const deferredInstallCompleted = Promise.withResolvers();
+
+  Harness.installEndedCallback = (install, addon) => addon.uninstall();
+  Harness.installsCompletedCallback = deferredInstallCompleted.resolve;
   Harness.setup();
 
   PermissionTestUtils.add(
@@ -19,7 +24,7 @@ function test() {
     JSON.stringify({
       "Unsigned XPI": {
         URL: TESTROOT + "amosigned.xpi",
-        Hash: "sha1:EE95834AD862245A9EF99CCECC2A857CADC16404",
+        Hash: `sha256:${xpiFileHash.toUpperCase()}`,
         toString() {
           return this.URL;
         },
@@ -31,17 +36,13 @@ function test() {
     gBrowser,
     TESTROOT + "installtrigger.html?" + triggers
   );
-}
-
-function install_ended(install, addon) {
-  return addon.uninstall();
-}
 
-function finish_test(count) {
+  info("Wait for the install to be completed");
+  const count = await deferredInstallCompleted.promise;
   is(count, 1, "1 Add-on should have been successfully installed");
 
   PermissionTestUtils.remove("http://example.com", "install");
 
   gBrowser.removeCurrentTab();
   Harness.finish();
-}
+});