Bug 1651490 - followup to make the new OpenPGP xpcshell tests work after bug 1664701. rs=bustage-fix
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Wed, 11 Nov 2020 11:20:24 +0200
changeset 40380 9e145e871c4c060bac525378f2b82d2c85efec6f
parent 40379 8fd1b44855a35346818ca6878759dfb3f1cccd05
child 40381 1a56d35ed59465d27e9193af0408382e57746bb3
push id2849
push userthunderbird@calypsoblue.org
push dateMon, 16 Nov 2020 19:06:44 +0000
treeherdercomm-beta@1cf7ad0dcfa6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1651490, 1664701
Bug 1651490 - followup to make the new OpenPGP xpcshell tests work after bug 1664701. rs=bustage-fix
mail/test/browser/shared-modules/OpenPGPTestUtils.jsm
--- a/mail/test/browser/shared-modules/OpenPGPTestUtils.jsm
+++ b/mail/test/browser/shared-modules/OpenPGPTestUtils.jsm
@@ -14,16 +14,18 @@ const { EnigmailFiles } = ChromeUtils.im
 );
 const { PgpSqliteDb2 } = ChromeUtils.import(
   "chrome://openpgp/content/modules/sqliteDb.jsm"
 );
 const { uidHelper } = ChromeUtils.import(
   "chrome://openpgp/content/modules/uidHelper.jsm"
 );
 
+EnigmailKeyRing.init(); // When used through UI, inited by BondOpenPGP.init().
+
 const OpenPGPTestUtils = {
   ACCEPTANCE_PERSONAL: "personal",
   ACCEPTANCE_REJECTED: "rejected",
   ACCEPTANCE_UNVERIFIED: "unverified",
   ACCEPTANCE_VERIFIED: "verified",
   ACCEPTANCE_UNDECIDED: "undecided",
   ALICE_KEY_ID: "F231550C4F47E38E",
   BOB_KEY_ID: "FBFCC82A015E7330",