Graceful rimraf in updater

This commit is contained in:
Fedor Indutny
2023-03-02 09:57:36 -08:00
committed by GitHub
parent c488b626bf
commit 1e7d658109
4 changed files with 58 additions and 39 deletions

View File

@@ -17,6 +17,7 @@ import {
getTempDir,
deleteTempDir,
} from '../../updater/common';
import * as log from '../../logging/log';
describe('updater/signatures', () => {
const windows = parseYaml(`version: 1.23.2
@@ -164,7 +165,7 @@ releaseDate: '2021-12-03T19:00:23.754Z'
const dir = await createTempDir();
assert.isTrue((await stat(dir)).isDirectory());
await deleteTempDir(dir);
await deleteTempDir(log, dir);
assert.isFalse(await pathExists(dir), 'Directory should be deleted');
});
@@ -181,7 +182,7 @@ releaseDate: '2021-12-03T19:00:23.754Z'
await mkdir(dir);
await deleteTempDir(dir);
await deleteTempDir(log, dir);
assert.isFalse(await pathExists(dir), 'Directory should be deleted');
});

View File

@@ -17,6 +17,7 @@ import {
} from '../../updater/signature';
import { createTempDir, deleteTempDir } from '../../updater/common';
import { keyPair } from '../../updater/curve';
import * as log from '../../logging/log';
describe('updater/signatures', () => {
it('_getFileHash returns correct hash', async () => {
@@ -48,7 +49,7 @@ describe('updater/signatures', () => {
);
} finally {
if (tempDir) {
await deleteTempDir(tempDir);
await deleteTempDir(log, tempDir);
}
}
});
@@ -86,7 +87,7 @@ describe('updater/signatures', () => {
assert.strictEqual(verified, true);
} finally {
if (tempDir) {
await deleteTempDir(tempDir);
await deleteTempDir(log, tempDir);
}
}
});
@@ -123,7 +124,7 @@ describe('updater/signatures', () => {
assert.strictEqual(verified, false);
} finally {
if (tempDir) {
await deleteTempDir(tempDir);
await deleteTempDir(log, tempDir);
}
}
});
@@ -160,7 +161,7 @@ describe('updater/signatures', () => {
assert.strictEqual(verified, false);
} finally {
if (tempDir) {
await deleteTempDir(tempDir);
await deleteTempDir(log, tempDir);
}
}
});
@@ -202,7 +203,7 @@ describe('updater/signatures', () => {
assert.strictEqual(verified, false);
} finally {
if (tempDir) {
await deleteTempDir(tempDir);
await deleteTempDir(log, tempDir);
}
}
});
@@ -239,7 +240,7 @@ describe('updater/signatures', () => {
assert.strictEqual(verified, false);
} finally {
if (tempDir) {
await deleteTempDir(tempDir);
await deleteTempDir(log, tempDir);
}
}
});