Skip to content

Commit 4b8f46b

Browse files
committed
More test tweaks
1 parent b82a9b1 commit 4b8f46b

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

.github/workflows/pr-check.yml

+5
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,11 @@ jobs:
112112
cache: 'npm'
113113
cache-dependency-path: ${{ env.special-working-directory-relative }}/package-lock.json
114114

115+
- name: Use Python 3.x
116+
uses: actions/setup-python@v5
117+
with:
118+
python-version: '3.x'
119+
115120
- name: Install Node dependencies
116121
run: npm ci
117122
shell: bash

src/test/ts_tests/tests/common/minimal.smoke.test.ts

+16-15
Original file line numberDiff line numberDiff line change
@@ -79,24 +79,25 @@ suite('Smoke Tests', function () {
7979
assert.ok(editor, 'No active editor');
8080
assert.ok(editor?.document.uri.fsPath.endsWith('myscript.py'), 'Active editor is not myscript.py');
8181

82+
vscode.workspace.workspaceFolders?.forEach((f) => console.log(`Loaded workspace: ${f.uri.fsPath}`));
83+
8284
console.log('Waiting for Black formatter to load...');
8385
const formatReady = new Promise<void>((resolve, reject) => {
84-
const disposable = vscode.workspace.onDidChangeTextDocument((e) => {
85-
if (e.document.uri.fsPath.includes('Black')) {
86-
const text = e.document.getText();
87-
console.log(text);
88-
if (text.includes('FOUND black==')) {
89-
console.log('Waiting for Black formatter to finished loading');
90-
disposable.dispose();
91-
resolve();
92-
}
93-
if (text.includes('Python interpreter missing')) {
94-
console.log('Waiting for Black formatter failed to load');
95-
disposable.dispose();
96-
reject();
86+
disposables.push(
87+
vscode.workspace.onDidChangeTextDocument((e) => {
88+
if (e.document.uri.fsPath.includes('Black')) {
89+
const text = e.document.getText();
90+
console.log(text);
91+
if (text.includes('FOUND black==') || text.includes('initialized')) {
92+
console.log('Waiting for Black formatter to finished loading');
93+
resolve();
94+
} else if (text.includes('Python interpreter missing')) {
95+
console.log('Waiting for Black formatter failed to load');
96+
reject();
97+
}
9798
}
98-
}
99-
});
99+
}),
100+
);
100101
});
101102
await formatReady;
102103

0 commit comments

Comments
 (0)