Increase the timeout for clearing indexeddbs

Chrome seems to take ages (like, 1500ms regularly) to clear out the indexeddbs,
and that's causing test timeouts. Bump the timeout to hack around it.

Also: clear both dbs in parallel (can't hurt, right?) and improve diagnostics
on the process.
This commit is contained in:
Richard van der Hoff 2017-07-20 11:01:27 +01:00
parent cb4f57eb4a
commit 238afde00a
2 changed files with 11 additions and 4 deletions

View File

@ -82,9 +82,14 @@ describe('loading:', function () {
// unmounting should have cleared the MatrixClientPeg
expect(MatrixClientPeg.get()).toBe(null);
// chrome seems to take *ages* to delete the indexeddbs.
this.timeout(10000);
// clear the indexeddbs so we can start from a clean slate next time.
await test_utils.deleteIndexedDB('matrix-js-sdk:crypto');
await test_utils.deleteIndexedDB('matrix-js-sdk:riot-web-sync');
await Promise.all([
test_utils.deleteIndexedDB('matrix-js-sdk:crypto'),
test_utils.deleteIndexedDB('matrix-js-sdk:riot-web-sync'),
]);
console.log(`${Date.now()}: loading: afterEach complete`);
});

View File

@ -34,7 +34,8 @@ export function deleteIndexedDB(dbName) {
return;
}
console.log(`${Date.now()}: Removing indexeddb instance: ${dbName}`);
const startTime = Date.now();
console.log(`${startTime}: Removing indexeddb instance: ${dbName}`);
const req = window.indexedDB.deleteDatabase(dbName);
req.onblocked = () => {
@ -48,7 +49,8 @@ export function deleteIndexedDB(dbName) {
};
req.onsuccess = () => {
console.log(`${Date.now()}: Removed indexeddb instance: ${dbName}`);
const now = Date.now();
console.log(`${now}: Removed indexeddb instance: ${dbName} in ${now-startTime} ms`);
resolve();
};
}).catch((e) => {