Corrected suffix

build/ci/addEnvPath.py

@@ -2,14 +2,19 @@
 
 import json,sys
 import os.path
-key = sys.argv[1]
+jsonPath = sys.argv[1]
+key = sys.argv[2]
 
-if os.path.isfile('$(ENV_PATHS_LOCATION)'):
-    with open('$(ENV_PATHS_LOCATION)', 'r') as read_file:
+if os.path.isfile(jsonPath):
+    with open(jsonPath, 'r') as read_file:
         data = json.load(read_file)
 else:
-    with open('$(ENV_PATHS_LOCATION)', 'w+') as read_file:
-        data = {}
-with open('$(ENV_PATHS_LOCATION)', 'w') as outfile:
+    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:
     data[key] = sys.executable
     json.dump(data, outfile, sort_keys=True, indent=4)

build/ci/templates/virtual_env_tests.yml

@@ -86,7 +86,7 @@ jobs:
     - bash: |
        pip install pipenv
 
-       pipenv run python ./build/ci/addEnvPath.py pipenvPath
+       pipenv run python ./build/ci/addEnvPath.py $(ENV_PATHS_LOCATION) pipenvPath
 
        cat $(ENV_PATHS_LOCATION)
 
@@ -96,7 +96,7 @@ jobs:
     - bash: |
        python -m venv .venv
 
-       .venv/$(environmentExecutableFolder)/python ./build/ci/addEnvPath.py venvPath
+       .venv/$(environmentExecutableFolder)/python ./build/ci/addEnvPath.py $(ENV_PATHS_LOCATION) venvPath
 
        cat $(ENV_PATHS_LOCATION)
 
@@ -108,7 +108,7 @@ jobs:
 
        python -m virtualenv .virtualenv
 
-       .virtualenv/$(environmentExecutableFolder)/python ./build/ci/addEnvPath.py virtualEnvPath
+       .virtualenv/$(environmentExecutableFolder)/python ./build/ci/addEnvPath.py $(ENV_PATHS_LOCATION) virtualEnvPath
 
        cat $(ENV_PATHS_LOCATION)
 
@@ -122,7 +122,7 @@ jobs:
 
 
     # - bash: |
-    #    python ./build/ci/addEnvPath.py conda
+    #    python ./build/ci/addEnvPath.py $(ENV_PATHS_LOCATION) condaPath
 
     #    source deactivate
 

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

@@ -28,7 +28,7 @@ jobs:
     PoolName: 'Hosted VS2017'
     EnvironmentExecutableFolder: 'Scripts'
     ENV_PATHS_LOCATION: './src/tmp/envPaths.json'
-    TEST_FILES_SUFFIX: 'testvirtualenvs.ts'
+    TEST_FILES_SUFFIX: 'testvirtualenvs'
     TestSuiteName: 'testSingleWorkspace'
 
 

src/test/common/terminals/environmentActivationProviders/terminalActivation.testvirtualenvs.ts

@@ -14,7 +14,7 @@ import { initialize, initializeTest } from '../../../initialize';
 suite('Activation of Environments in Terminal', () => {
     const file = path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'src', 'testMultiRootWkspc', 'smokeTests', 'testExecInTerminal.py');
     const outputFile = path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'src', 'testMultiRootWkspc', 'smokeTests', 'testExecInTerminal.log');
-    const envPathsLocation = ENV_PATHS_LOCATION || path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'src', 'tmp', 'envPaths.json');
+    const envPathsLocation = ENV_PATHS_LOCATION || path.join('.', 'src', 'tmp', 'envPaths.json');
     const waitTimeForActivation = 5000;
     type EnvPath = {
         venvPath: string;