Skip to content

Commit d63b756

Browse files
committed
Set unsafeCleanup for all test tmp directories
We want to remove the tmp directories after tests, even if they are not empty.
1 parent 889055e commit d63b756

11 files changed

Lines changed: 36 additions & 15 deletions

File tree

extensions/ql-vscode/test/unit-tests/databases/local-databases/db-contents-heuristics.test.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ import {
99
describe("isLikelyDatabaseRoot", () => {
1010
let dir: tmp.DirResult;
1111
beforeEach(() => {
12-
dir = tmp.dirSync();
12+
dir = tmp.dirSync({
13+
unsafeCleanup: true,
14+
});
1315
});
1416

1517
afterEach(() => {
@@ -54,7 +56,9 @@ describe("isLikelyDatabaseRoot", () => {
5456
describe("isLikelyDbLanguageFolder", () => {
5557
let dir: tmp.DirResult;
5658
beforeEach(() => {
57-
dir = tmp.dirSync();
59+
dir = tmp.dirSync({
60+
unsafeCleanup: true,
61+
});
5862
});
5963

6064
afterEach(() => {

extensions/ql-vscode/test/unit-tests/local-queries/query-contents.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ describe("getInitialQueryContents", () => {
1010
let language: QueryLanguage;
1111

1212
beforeEach(() => {
13-
dir = tmp.dirSync();
13+
dir = tmp.dirSync({
14+
unsafeCleanup: true,
15+
});
1416
language = QueryLanguage.Cpp;
1517

1618
const contents = dump({

extensions/ql-vscode/test/vscode-tests/cli-integration/model-editor/modeled-method-fs.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ describe("modeled-method-fs", () => {
6161
process.platform === "win32"
6262
? join(homedir(), "AppData", "Local", "Temp")
6363
: undefined,
64+
unsafeCleanup: true,
6465
});
6566
tmpDir = t.name;
6667
tmpDirRemoveCallback = t.removeCallback;

extensions/ql-vscode/test/vscode-tests/jest.activated-extension.setup.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ let removeStorage: tmp.DirResult["removeCallback"] | undefined;
1919

2020
export async function beforeAllAction() {
2121
// Create the temp directory to be used as extension local storage.
22-
const dir = tmp.dirSync();
22+
const dir = tmp.dirSync({
23+
unsafeCleanup: true,
24+
});
2325
let storagePath = realpathSync(dir.name);
2426
if (storagePath.substring(0, 2).match(/[A-Z]:/)) {
2527
storagePath =

extensions/ql-vscode/test/vscode-tests/minimal-workspace/common/vscode/file-path-discovery.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ describe("FilePathDiscovery", () => {
8383
let discovery: TestFilePathDiscovery;
8484

8585
beforeEach(() => {
86-
const t = tmp.dirSync();
86+
const t = tmp.dirSync({
87+
unsafeCleanup: true,
88+
});
8789
tmpDir = normalizePath(t.name);
8890
tmpDirRemoveCallback = t.removeCallback;
8991

extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-queries/local-databases.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ describe("local databases", () => {
5252
let extensionContextStoragePath: string;
5353

5454
beforeEach(() => {
55-
dir = tmp.dirSync();
55+
dir = tmp.dirSync({
56+
unsafeCleanup: true,
57+
});
5658

5759
updateSpy = jest.fn(() => Promise.resolve(undefined));
5860
registerSpy = jest.fn(() => Promise.resolve(undefined));

extensions/ql-vscode/test/vscode-tests/minimal-workspace/qlpack-generator.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ describe("QlPackGenerator", () => {
2525
let dir: tmp.DirResult;
2626

2727
beforeEach(async () => {
28-
dir = tmp.dirSync();
28+
dir = tmp.dirSync({
29+
unsafeCleanup: true,
30+
});
2931

3032
language = "ruby";
3133
packFolderPath = Uri.file(

extensions/ql-vscode/test/vscode-tests/minimal-workspace/queries-panel/query-discovery.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ describe("Query pack discovery", () => {
3131
let discovery: QueryDiscovery;
3232

3333
beforeEach(() => {
34-
const t = tmp.dirSync();
34+
const t = tmp.dirSync({
35+
unsafeCleanup: true,
36+
});
3537
tmpDir = t.name;
3638
tmpDirRemoveCallback = t.removeCallback;
3739

extensions/ql-vscode/test/vscode-tests/minimal-workspace/queries-panel/query-pack-discovery.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ describe("Query pack discovery", () => {
1818
let discovery: QueryPackDiscovery;
1919

2020
beforeEach(() => {
21-
const t = tmp.dirSync();
21+
const t = tmp.dirSync({
22+
unsafeCleanup: true,
23+
});
2224
tmpDir = t.name;
2325
tmpDirRemoveCallback = t.removeCallback;
2426

extensions/ql-vscode/test/vscode-tests/no-workspace/code-tour/code-tour.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ describe("prepareCodeTour", () => {
1414
>;
1515

1616
beforeEach(() => {
17-
dir = tmp.dirSync();
17+
dir = tmp.dirSync({
18+
unsafeCleanup: true,
19+
});
1820

1921
const mockWorkspaceFolders = [
2022
{

0 commit comments

Comments
 (0)