Skip to content

revert VSC_PYTHON_CI_TEST_VSC_CHANNEL changes #14109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 28, 2020
Merged

revert VSC_PYTHON_CI_TEST_VSC_CHANNEL changes #14109

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ed8f61
revert VSC_PYTHON_CI_TEST_VSC_CHANNEL changes
karthiknadig Sep 25, 2020
e5d7814
Revert "revert VSC_PYTHON_CI_TEST_VSC_CHANNEL changes"
karthiknadig Sep 28, 2020
a323fd3
Remove force 1.48 on Test VSC channel
karthiknadig Sep 28, 2020
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: 0 additions & 1 deletion build/ci/templates/globals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ 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: 1 addition & 2 deletions src/test/debuggerTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ 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 @@ -19,7 +18,7 @@ function start() {
extensionDevelopmentPath: EXTENSION_ROOT_DIR_FOR_TESTS,
extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
launchArgs: [workspacePath],
version: channel,
version: 'stable',
extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
}).catch((ex) => {
console.error('End Debugger tests (with errors)', ex);
Expand Down
4 changes: 1 addition & 3 deletions src/test/multiRootTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@ 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: channel,
version: 'stable',
extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
}).catch((ex) => {
console.error('End Multiroot tests (with errors)', ex);
Expand Down
4 changes: 3 additions & 1 deletion src/test/standardTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ 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 || 'stable';
const channel = (process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL || '').toLowerCase().includes('insiders')
? 'insiders'
: 'stable';

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