storage - add beforeClose() to tests

This commit is contained in:
Benjamin Pasero
2018-12-01 13:57:20 +01:00
parent fbec0a8f01
commit e7bfb7b0ef
2 changed files with 9 additions and 1 deletions
+1 -1
View File
@@ -280,7 +280,7 @@ export class Storage extends Disposable implements IStorage {
// even if there is an error flushing. We must always ensure
// the DB is closed to avoid corruption.
const onDone = () => this.database.close();
return this.flushDelayer.trigger(() => this.flushPending(), this.flushDelay).then(onDone, onDone);
return this.flushDelayer.trigger(() => this.flushPending(), 0 /* as soon as possible */).then(onDone, onDone);
}
private flushPending(): Thenable<void> {
@@ -90,6 +90,7 @@ suite('Storage Library', () => {
await Promise.all([delete1Promise, delete2Promise, delete3Promise]).then(() => deletePromiseResolved = true);
equal(deletePromiseResolved, true);
storage.beforeClose();
await storage.close();
await del(storageDir, tmpdir());
});
@@ -146,6 +147,7 @@ suite('Storage Library', () => {
database.fireDidChangeItemsExternal({ items: change });
equal(changes.size, 0);
storage.beforeClose();
await storage.close();
await del(storageDir, tmpdir());
});
@@ -166,6 +168,7 @@ suite('Storage Library', () => {
let setPromiseResolved = false;
Promise.all([set1Promise, set2Promise]).then(() => setPromiseResolved = true);
storage.beforeClose();
await storage.close();
equal(setPromiseResolved, true);
@@ -176,6 +179,7 @@ suite('Storage Library', () => {
equal(storage.get('foo'), 'bar');
equal(storage.get('bar'), 'foo');
storage.beforeClose();
await storage.close();
storage = new Storage(new SQLiteStorageDatabase(join(storageDir, 'storage.db')));
@@ -190,6 +194,7 @@ suite('Storage Library', () => {
let deletePromiseResolved = false;
Promise.all([delete1Promise, delete2Promise]).then(() => deletePromiseResolved = true);
storage.beforeClose();
await storage.close();
equal(deletePromiseResolved, true);
@@ -200,6 +205,7 @@ suite('Storage Library', () => {
ok(!storage.get('foo'));
ok(!storage.get('bar'));
storage.beforeClose();
await storage.close();
await del(storageDir, tmpdir());
});
@@ -242,6 +248,7 @@ suite('Storage Library', () => {
await Promise.all([set4Promise, delete1Promise]).then(() => setAndDeletePromiseResolved = true);
ok(setAndDeletePromiseResolved);
storage.beforeClose();
await storage.close();
await del(storageDir, tmpdir());
});
@@ -620,6 +627,7 @@ suite('SQLite Storage Library', () => {
equal(items.get('foo3'), 'bar');
equal(items.get('some/foo3/path'), 'some/bar/path');
storage.beforeClose();
await storage.close();
await del(storageDir, tmpdir());