Skip to content

Commit 662804f

Browse files
authored
Merge branch 'main' into pep440
2 parents 0091cdb + 4aaf742 commit 662804f

14 files changed

Lines changed: 568 additions & 57 deletions

File tree

.github/workflows/pr-check.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,6 @@ jobs:
151151
- name: Compile Tests
152152
run: npm run compile-tests
153153

154-
- name: Configure Test Settings
155-
run: |
156-
mkdir -p .vscode-test/user-data/User
157-
echo '{"python.useEnvironmentsExtension": true}' > .vscode-test/user-data/User/settings.json
158-
shell: bash
159-
160154
- name: Run Smoke Tests (Linux)
161155
if: runner.os == 'Linux'
162156
uses: GabrielBB/xvfb-action@v1
@@ -244,12 +238,6 @@ jobs:
244238
- name: Compile Tests
245239
run: npm run compile-tests
246240

247-
- name: Configure Test Settings
248-
run: |
249-
mkdir -p .vscode-test/user-data/User
250-
echo '{"python.useEnvironmentsExtension": true}' > .vscode-test/user-data/User/settings.json
251-
shell: bash
252-
253241
- name: Run E2E Tests (Linux)
254242
if: runner.os == 'Linux'
255243
uses: GabrielBB/xvfb-action@v1
@@ -337,12 +325,6 @@ jobs:
337325
- name: Compile Tests
338326
run: npm run compile-tests
339327

340-
- name: Configure Test Settings
341-
run: |
342-
mkdir -p .vscode-test/user-data/User
343-
echo '{"python.useEnvironmentsExtension": true}' > .vscode-test/user-data/User/settings.json
344-
shell: bash
345-
346328
- name: Run Integration Tests (Linux)
347329
if: runner.os == 'Linux'
348330
uses: GabrielBB/xvfb-action@v1
@@ -387,12 +369,6 @@ jobs:
387369
- name: Compile Tests
388370
run: npm run compile-tests
389371

390-
- name: Configure Test Settings
391-
run: |
392-
mkdir -p .vscode-test/user-data/User
393-
echo '{"python.useEnvironmentsExtension": true}' > .vscode-test/user-data/User/settings.json
394-
shell: bash
395-
396372
- name: Run Integration Tests Multi-Root (Linux)
397373
if: runner.os == 'Linux'
398374
uses: GabrielBB/xvfb-action@v1

.github/workflows/push-check.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,6 @@ jobs:
152152
- name: Compile Tests
153153
run: npm run compile-tests
154154

155-
- name: Configure Test Settings
156-
run: |
157-
mkdir -p .vscode-test/user-data/User
158-
echo '{"python.useEnvironmentsExtension": true}' > .vscode-test/user-data/User/settings.json
159-
shell: bash
160-
161155
- name: Run Smoke Tests (Linux)
162156
if: runner.os == 'Linux'
163157
uses: GabrielBB/xvfb-action@v1
@@ -245,12 +239,6 @@ jobs:
245239
- name: Compile Tests
246240
run: npm run compile-tests
247241

248-
- name: Configure Test Settings
249-
run: |
250-
mkdir -p .vscode-test/user-data/User
251-
echo '{"python.useEnvironmentsExtension": true}' > .vscode-test/user-data/User/settings.json
252-
shell: bash
253-
254242
- name: Run E2E Tests (Linux)
255243
if: runner.os == 'Linux'
256244
uses: GabrielBB/xvfb-action@v1
@@ -338,12 +326,6 @@ jobs:
338326
- name: Compile Tests
339327
run: npm run compile-tests
340328

341-
- name: Configure Test Settings
342-
run: |
343-
mkdir -p .vscode-test/user-data/User
344-
echo '{"python.useEnvironmentsExtension": true}' > .vscode-test/user-data/User/settings.json
345-
shell: bash
346-
347329
- name: Run Integration Tests (Linux)
348330
if: runner.os == 'Linux'
349331
uses: GabrielBB/xvfb-action@v1

.vscode-test.mjs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
11
import { defineConfig } from '@vscode/test-cli';
2+
import * as fs from 'fs';
3+
import * as os from 'os';
24
import * as path from 'path';
35

4-
// Explicit user data directory - ensures VS Code reads our settings.json
5-
const userDataDir = path.resolve('.vscode-test/user-data');
6+
// Keep this path short: macOS caps Unix-domain socket paths at 103 chars and
7+
// VS Code creates `<userDataDir>/<x.y>-main.sock`. An in-workspace location
8+
// (e.g. /Users/runner/work/<repo>/<repo>/.vscode-test/user-data) overflows.
9+
const userDataDir = path.join(os.tmpdir(), 'vsct-ud');
10+
11+
// Seed user settings.json so the extension actually activates: without
12+
// `python.useEnvironmentsExtension=true` it short-circuits during activation
13+
// and the smoke/e2e/integration tests see no registered managers.
14+
const userDir = path.join(userDataDir, 'User');
15+
fs.mkdirSync(userDir, { recursive: true });
16+
fs.writeFileSync(
17+
path.join(userDir, 'settings.json'),
18+
JSON.stringify({ 'python.useEnvironmentsExtension': true }) + '\n',
19+
);
620

721
export default defineConfig([
822
{

0 commit comments

Comments
 (0)