Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/pr-darwin-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
ARTIFACT_NAME: ${{ (inputs.electron_tests && 'electron') || (inputs.browser_tests && 'browser') || (inputs.remote_tests && 'remote') || 'unknown' }}${{ (inputs.unit_tests && !inputs.integration_tests && '-unit') || (!inputs.unit_tests && !inputs.integration_tests && inputs.smoke_tests && '-smoke') || '' }}
NPM_ARCH: arm64
VSCODE_ARCH: arm64
VSCODE_SKIP_PRELAUNCH: '1'
steps:
- name: Checkout microsoft/vscode
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
Expand Down Expand Up @@ -222,7 +223,7 @@ jobs:
run: npm run compile

- name: Compile Copilot Chat extension for smoke tests
if: ${{ inputs.smoke_tests }}
if: ${{ inputs.smoke_tests && !inputs.browser_tests }}
working-directory: extensions/copilot
run: npm run compile

Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/pr-linux-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
ARTIFACT_NAME: ${{ (inputs.electron_tests && 'electron') || (inputs.browser_tests && 'browser') || (inputs.remote_tests && 'remote') || 'unknown' }}${{ (inputs.unit_tests && !inputs.integration_tests && '-unit') || (!inputs.unit_tests && !inputs.integration_tests && inputs.smoke_tests && '-smoke') || '' }}
NPM_ARCH: x64
VSCODE_ARCH: x64
VSCODE_SKIP_PRELAUNCH: '1'
steps:
- name: Checkout microsoft/vscode
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
Expand Down Expand Up @@ -425,7 +426,7 @@ jobs:
run: npm run compile

- name: Compile Copilot Chat extension for smoke tests
if: ${{ inputs.smoke_tests }}
if: ${{ inputs.smoke_tests && !inputs.browser_tests }}
working-directory: extensions/copilot
run: npm run compile

Expand All @@ -442,7 +443,7 @@ jobs:
# https://github.com/anthropics/claude-agent-sdk-typescript for the SDK
# resolution order.
- name: Remove musl Claude binary on glibc Linux
if: ${{ inputs.smoke_tests }}
if: ${{ inputs.smoke_tests && !inputs.browser_tests }}
run: rm -rf node_modules/@anthropic-ai/claude-agent-sdk-linux-x64-musl node_modules/@anthropic-ai/claude-agent-sdk-linux-arm64-musl

- name: Diagnostics before smoke test run (processes, max_user_watches, number of opened file handles)
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pr-win32-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
ARTIFACT_NAME: ${{ (inputs.electron_tests && 'electron') || (inputs.browser_tests && 'browser') || (inputs.remote_tests && 'remote') || 'unknown' }}${{ (inputs.unit_tests && !inputs.integration_tests && '-unit') || (!inputs.unit_tests && !inputs.integration_tests && inputs.smoke_tests && '-smoke') || '' }}
NPM_ARCH: x64
VSCODE_ARCH: x64
VSCODE_SKIP_PRELAUNCH: '1'
steps:
- name: Checkout microsoft/vscode
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
Expand Down Expand Up @@ -257,7 +258,7 @@ jobs:
run: npm run compile

- name: Compile Copilot Chat extension for smoke tests
if: ${{ inputs.smoke_tests }}
if: ${{ inputs.smoke_tests && !inputs.browser_tests }}
working-directory: extensions/copilot
run: npm run compile

Expand Down
2 changes: 1 addition & 1 deletion extensions/vscode-test-resolver/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export function activate(context: vscode.ExtensionContext) {
}

const { updateUrl, commit, quality, serverDataFolderName, serverApplicationName, dataFolderName } = getProductConfiguration();
const commandArgs = ['--host=127.0.0.1', '--port=0', '--disable-telemetry', '--disable-experiments', '--use-host-proxy', '--accept-server-license-terms'];
const commandArgs = ['--host=127.0.0.1', '--port=0', '--disable-telemetry', '--disable-experiments', '--use-host-proxy', '--accept-server-license-terms', '--force-disable-user-env'];
const env = getNewEnv();
const remoteDataDir = process.env['TESTRESOLVER_DATA_FOLDER'] || path.join(os.homedir(), `${serverDataFolderName || dataFolderName}-testresolver`);
const logsDir = process.env['TESTRESOLVER_LOGS_FOLDER'];
Expand Down
1 change: 1 addition & 0 deletions test/automation/src/playwrightBrowser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ async function launchServer(options: LaunchOptions) {
'--disable-telemetry',
'--disable-experiments',
'--disable-workspace-trust',
'--force-disable-user-env',
`--port=${port++}`,
'--enable-smoke-test-driver',
'--accept-server-license-terms',
Expand Down
2 changes: 1 addition & 1 deletion test/integration/browser/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ async function launchServer(browserType: BrowserType, browserChannel: BrowserCha
...process.env
};

const serverArgs = ['--enable-proposed-api', '--disable-telemetry', '--disable-experiments', '--server-data-dir', userDataDir, '--accept-server-license-terms', '--disable-workspace-trust', '--enable-smoke-test-driver'];
const serverArgs = ['--enable-proposed-api', '--disable-telemetry', '--disable-experiments', '--server-data-dir', userDataDir, '--accept-server-license-terms', '--disable-workspace-trust', '--enable-smoke-test-driver', '--force-disable-user-env'];

let serverLocation: string;
if (process.env.VSCODE_REMOTE_SERVER_PATH) {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/browser/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ const withReporter = (function () {
{
const testResultsRoot = process.env.BUILD_ARTIFACTSTAGINGDIRECTORY || process.env.GITHUB_WORKSPACE;
return (browserType, runner) => {
new mocha.reporters.Spec(runner);
new mocha.reporters.Dot(runner);
new MochaJUnitReporter(runner, {
reporterOptions: {
testsuitesTitle: `${args.tfs} ${process.platform}`,
Expand Down