Skip to content
Merged
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
1 change: 1 addition & 0 deletions build/ci/templates/globals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ variables:
npm_config_cache: $(Pipeline.Workspace)/.npm
vmImageMacOS: 'macOS-10.15'
TS_NODE_FILES: true # Temporarily enabled to allow using types from vscode.proposed.d.ts from ts-node (for tests).
VSC_PYTHON_CI_TEST_VSC_CHANNEL: '1.48.0' # Enforce this until https://github.com/microsoft/vscode-test/issues/73 is fixed
3 changes: 2 additions & 1 deletion src/test/debuggerTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { EXTENSION_ROOT_DIR_FOR_TESTS } from './constants';
const workspacePath = path.join(__dirname, '..', '..', 'src', 'testMultiRootWkspc', 'multi.code-workspace');
process.env.IS_CI_SERVER_TEST_DEBUGGER = '1';
process.env.VSC_PYTHON_CI_TEST = '1';
const channel = process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL || 'stable';

function start() {
console.log('*'.repeat(100));
Expand All @@ -18,7 +19,7 @@ function start() {
extensionDevelopmentPath: EXTENSION_ROOT_DIR_FOR_TESTS,
extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
launchArgs: [workspacePath],
version: 'stable',
version: channel,
extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
}).catch((ex) => {
console.error('End Debugger tests (with errors)', ex);
Expand Down
4 changes: 3 additions & 1 deletion src/test/multiRootTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@ process.env.VSC_PYTHON_CI_TEST = '1';

initializeLogger();

const channel = process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL || 'stable';

function start() {
console.log('*'.repeat(100));
console.log('Start Multiroot tests');
runTests({
extensionDevelopmentPath: EXTENSION_ROOT_DIR_FOR_TESTS,
extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
launchArgs: [workspacePath],
version: 'stable',
version: channel,
extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
}).catch((ex) => {
console.error('End Multiroot tests (with errors)', ex);
Expand Down
4 changes: 1 addition & 3 deletions src/test/standardTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ const extensionDevelopmentPath = process.env.CODE_EXTENSIONS_PATH
? process.env.CODE_EXTENSIONS_PATH
: EXTENSION_ROOT_DIR_FOR_TESTS;

const channel = (process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL || '').toLowerCase().includes('insiders')
? 'insiders'
: 'stable';
const channel = process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL || 'stable';

function start() {
console.log('*'.repeat(100));
Expand Down