Added system tests to check activation for virtual environments

build/ci/addEnvPath.py

@@ -0,0 +1,26 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+#Adds the virtual environment's executable path to json file
+
+import json,sys
+import os.path
+jsonPath = sys.argv[1]
+key = sys.argv[2]
+
+if os.path.isfile(jsonPath):
+    with open(jsonPath, 'r') as read_file:
+        data = json.load(read_file)
+else:
+    directory = os.path.dirname(jsonPath)
+    if not os.path.exists(directory):
+        os.makedirs(directory)
+        with open(jsonPath, 'w+') as read_file:
+            data = {}
+    data = {}
+with open(jsonPath, 'w') as outfile:
+    if key == 'condaExecPath':
+        data[key] = sys.argv[3]
+    else:
+        data[key] = sys.executable
+    json.dump(data, outfile, sort_keys=True, indent=4)

build/ci/templates/virtual_env_tests.yml

@@ -0,0 +1,191 @@
+jobs:
+- job: ${{ parameters.name }}
+  dependsOn: 'PR_Validate_Windows_py37'
+  pool:
+    name: ${{ parameters.PoolName }}
+
+  variables:
+    nodeVersion: ${{ parameters.NodeVersion }}
+    npmVersion: ${{ parameters.NpmVersion }}
+    pythonVersion: ${{ parameters.PythonVersion }}
+    platform: ${{ parameters.Platform }}
+    azureStorageAcctName: ${{ parameters.AzureStorageAccountName }}
+    azureStorageContainerName: ${{ parameters.AzureStorageContainerName }}
+    environmentExecutableFolder: ${{ parameters.EnvironmentExecutableFolder }}
+    PYTHON_VIRTUAL_ENVS_LOCATION: ${{ parameters.PYTHON_VIRTUAL_ENVS_LOCATION }}
+    TEST_FILES_SUFFIX: ${{ parameters.TEST_FILES_SUFFIX }}
+    TestSuiteName: ${{ parameters.TestSuiteName }}
+
+  steps:
+    - bash: echo REQUESTED VARIABLE VALUES
+
+        echo Node Version = $(nodeVersion)
+
+        echo Python Version = $(pythonVersion)
+
+        echo NPM Version = $(npmVersion)
+
+        echo Mocha reportfile = '$(mochaReportFile)'
+
+        echo MOCHA_CI_REPORTFILE = $MOCHA_CI_REPORTFILE
+
+        echo MOCHA_CI_REPORTER_ID = $MOCHA_CI_REPORTER_ID
+
+        echo MOCHA_REPORTER_JUNIT = $MOCHA_REPORTER_JUNIT
+
+        echo COV_UUID = $COV_UUID
+
+        echo Run Hygiene = $(runHygiene)
+
+      displayName: 'Show build vars'
+      name: 'show_bld_vars'
+
+
+    - powershell: |
+        New-Item -ItemType directory -Path "$(System.ArtifactsDirectory)/bin-artifacts"
+
+        $buildArtifactUri = "https://$(azureStorageAcctName).blob.core.windows.net/$(azureStorageContainerName)/$(Build.BuildNumber)/bin-artifacts.zip"
+        Write-Verbose "Downloading from $buildArtifactUri"
+
+        $destination = "$(System.ArtifactsDirectory)/bin-artifacts/bin-artifacts.zip"
+        Write-Verbose "Destination file: $destination"
+
+        Invoke-WebRequest -Uri $buildArtifactUri -OutFile $destination -Verbose
+
+      displayName: 'Download bin-artifacts from cloud-storage'
+
+
+    - task: ExtractFiles@1
+      displayName: 'Splat bin-artifacts'
+      inputs:
+        archiveFilePatterns: '$(System.ArtifactsDirectory)/bin-artifacts/bin-artifacts.zip'
+
+        destinationFolder: '$(Build.SourcesDirectory)'
+
+        cleanDestinationFolder: false
+
+
+    - task: NodeTool@0
+      displayName: 'Use Node $(nodeVersion)'
+      inputs:
+        versionSpec: '$(nodeVersion)'
+
+
+    - task: UsePythonVersion@0
+      displayName: 'Use Python $(pythonVersion)'
+      inputs:
+        versionSpec: '$(pythonVersion)'
+
+
+    - task: CmdLine@1
+      displayName: 'pip install pipenv'
+      inputs:
+        filename: python
+
+        arguments: '-m pip install pipenv'
+
+
+    - bash: |
+       pipenv run python ./build/ci/addEnvPath.py $(PYTHON_VIRTUAL_ENVS_LOCATION) pipenvPath
+
+      displayName: 'Create and save pipenv environment'
+
+
+    - task: CmdLine@1
+      displayName: 'Create venv environment'
+      inputs:
+        filename: python
+
+        arguments: '-m venv .venv'
+
+
+    - bash: |
+       .venv/$(environmentExecutableFolder)/python ./build/ci/addEnvPath.py $(PYTHON_VIRTUAL_ENVS_LOCATION) venvPath
+
+      displayName: 'Save venv environment executable'
+
+
+    - task: CmdLine@1
+      displayName: 'pip install virtualenv'
+      inputs:
+        filename: python
+
+        arguments: '-m pip install virtualenv'
+
+
+    - task: CmdLine@1
+      displayName: 'Create virtualenv environment'
+      inputs:
+        filename: python
+
+        arguments: '-m virtualenv .virtualenv'
+
+
+    - bash: |
+       .virtualenv/$(environmentExecutableFolder)/python ./build/ci/addEnvPath.py $(PYTHON_VIRTUAL_ENVS_LOCATION) virtualEnvPath
+
+      displayName: 'Save virtualenv environment executable'
+
+    - powershell: |
+       Write-Host $Env:CONDA
+       Write-Host $Env:PYTHON_VIRTUAL_ENVS_LOCATION
+
+       if( '$(platform)' -eq 'Windows' ){
+           $condaPythonPath = Join-Path -Path $Env:CONDA -ChildPath python
+           $condaExecPath = Join-Path -Path $Env:CONDA -ChildPath conda
+
+       } else{
+           $condaPythonPath = Join-Path -Path $Env:CONDA -ChildPath $(environmentExecutableFolder) | Join-Path -ChildPath python
+           $condaExecPath = Join-Path -Path $Env:CONDA -ChildPath $(environmentExecutableFolder) | Join-Path -ChildPath conda
+
+       }
+
+       & $condaPythonPath ./build/ci/addEnvPath.py $(PYTHON_VIRTUAL_ENVS_LOCATION) condaPath
+
+       & $condaPythonPath ./build/ci/addEnvPath.py $(PYTHON_VIRTUAL_ENVS_LOCATION) condaExecPath $condaExecPath
+
+       Get-Content $Env:PYTHON_VIRTUAL_ENVS_LOCATION
+
+      displayName: 'Save conda environment executable'
+
+
+    - task: Npm@1
+      displayName: 'update npm'
+      inputs:
+        command: custom
+
+        verbose: true
+
+        customCommand: 'install -g npm@$(NpmVersion)'
+
+
+    - task: Npm@1
+      displayName: 'npm ci'
+      inputs:
+        command: custom
+
+        verbose: true
+
+        customCommand: ci
+
+
+    - script: |
+        set -e
+        /usr/bin/Xvfb :10 -ac >> /tmp/Xvfb.out 2>&1 &
+        disown -ar
+      displayName: 'Start xvfb'
+      condition: and(succeeded(), eq(variables['Platform'], 'Linux'))
+
+
+    - task: Npm@1
+      displayName: 'run $(TestSuiteName)'
+      inputs:
+        command: custom
+
+        verbose: true
+
+        customCommand: 'run $(TestSuiteName)'
+      env:
+        DISPLAY: :10
+
+

build/ci/vscode-python-pr-validation.yaml

@@ -16,6 +16,54 @@ jobs:
     AzureStorageAccountName: 'vscodepythonci'
     AzureStorageContainerName: 'vscode-python-ci'
 
+
+- template: templates/virtual_env_tests.yml
+  parameters:
+    name: 'VirtualEnv_Tests_Windows_py37'
+    PythonVersion: '3.7'
+    NodeVersion: '8.11.2'
+    NpmVersion: 'latest'
+    AzureStorageAccountName: 'vscodepythonci'
+    AzureStorageContainerName: 'vscode-python-ci'
+    Platform: 'Windows'
+    PoolName: 'Hosted VS2017'
+    EnvironmentExecutableFolder: 'Scripts'
+    PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json'
+    TEST_FILES_SUFFIX: 'testvirtualenvs'
+    TestSuiteName: 'testSingleWorkspace'
+
+
+- template: templates/virtual_env_tests.yml
+  parameters:
+    name: 'VirtualEnv_Tests_Linux_py37'
+    PythonVersion: '3.7'
+    NodeVersion: '8.11.2'
+    NpmVersion: 'latest'
+    AzureStorageAccountName: 'vscodepythonci'
+    AzureStorageContainerName: 'vscode-python-ci'
+    Platform: 'Linux'
+    PoolName: 'Hosted Ubuntu 1604'
+    EnvironmentExecutableFolder: 'bin'
+    PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json'
+    TEST_FILES_SUFFIX: 'testvirtualenvs'
+    TestSuiteName: 'testSingleWorkspace'
+
+
+- template: templates/virtual_env_tests.yml
+  parameters:
+    name: 'VirtualEnv_Tests_MacOS_py37'
+    PythonVersion: '3.7'
+    NodeVersion: '8.11.2'
+    NpmVersion: 'latest'
+    AzureStorageAccountName: 'vscodepythonci'
+    AzureStorageContainerName: 'vscode-python-ci'
+    Platform: 'macOS'
+    PoolName: 'Hosted macOS'
+    EnvironmentExecutableFolder: 'bin'
+    PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json'
+    TEST_FILES_SUFFIX: 'testvirtualenvs'
+    TestSuiteName: 'testSingleWorkspace'
+
 - job: 'System_Test_macOS'
   dependsOn: 'PR_Validate_Windows_py37'
   pool:

news/3 Code Health/1521.md

@@ -0,0 +1 @@
+Created system test to ensure terminal gets activated with anaconda environment

news/3 Code Health/1522.md

@@ -0,0 +1 @@
+Added system tests to ensure terminal gets activated with virtualenv environment

news/3 Code Health/1523.md

@@ -0,0 +1 @@
+Added system test to ensure terminal gets activated with pipenv

src/client/common/terminal/helper.ts

@@ -59,7 +59,6 @@ export class TerminalHelper implements ITerminalHelper {
     public getTerminalShellPath(): string {
         const workspace = this.serviceContainer.get<IWorkspaceService>(IWorkspaceService);
         const shellConfig = workspace.getConfiguration('terminal.integrated.shell');
-
         const platformService = this.serviceContainer.get<IPlatformService>(IPlatformService);
         let osSection = '';
         if (platformService.isWindows) {