Bug 1017237 - Ensure that Sqlite's AsyncShutdown phase displays the name of opened databases in case of crash r=Yoric

Differential Revision: https://phabricator.services.mozilla.com/D71398

toolkit/modules/Sqlite.jsm

@@ -4,7 +4,7 @@
 
 "use strict";
 
-var EXPORTED_SYMBOLS = ["Sqlite"];
+var EXPORTED_SYMBOLS = ["Sqlite", "Barriers"];
 
 // The maximum time to wait before considering a transaction stuck and rejecting
 // it. (Note that the minimum amount of time we wait is 20% less than this, see

toolkit/modules/tests/xpcshell/test_sqlite_shutdown.js

@@ -4,7 +4,7 @@
 "use strict";
 
 do_get_profile();
-
+let SqliteInternals = ChromeUtils.import("resource://gre/modules/Sqlite.jsm");
 ChromeUtils.import("resource://gre/modules/osfile.jsm");
 // OS.File doesn't like to be first imported during shutdown
 const { Sqlite } = ChromeUtils.import("resource://gre/modules/Sqlite.jsm");
@@ -60,6 +60,7 @@ function sleep(ms) {
 //
 add_task(async function test_shutdown_clients() {
   info("Ensuring that Sqlite.jsm doesn't shutdown before its clients");
+  let db1 = await getDummyDatabase("opened before shutdown");
 
   let assertions = [];
 
@@ -95,7 +96,29 @@ add_task(async function test_shutdown_clients() {
 
   assertions.push({ name: "dbOpened", value: () => dbOpened });
   assertions.push({ name: "dbClosed", value: () => dbClosed });
+  info(
+    "Making sure that the database we opened before shutdown shows up in the blockers"
+  );
+  SqliteInternals.Barriers.connections.wait();
+  let openedDbArray = SqliteInternals.Barriers.connections.state;
+  ok(
+    openedDbArray.length,
+    "There should be at least one database that shows up in the blockers."
+  );
 
+  function check(element) {
+    let dbOpenedName = element.name;
+    if (dbOpenedName.includes("opened before shutdown")) {
+      return true;
+    }
+    return false;
+  }
+  ok(
+    openedDbArray.some(check),
+    "The db 'opened before shutown' is present in the blocker"
+  );
+
+  db1.close();
   info("Now shutdown Sqlite.jsm synchronously");
   Services.prefs.setBoolPref("toolkit.asyncshutdown.testing", true);
   AsyncShutdown.profileBeforeChange._trigger();