Fix unit tests.

Author: ericsnowcurrently

src/test/common/terminals/synchronousTerminalService.unit.test.ts

@@ -67,6 +67,7 @@ suite('Terminal Service (synchronous)', () => {
         });
     });
     suite('sendCommand', () => {
+        const isolated = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'pyvsc-run-isolated.py');
         const shellExecFile = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'shell_exec.py');
 
         test('run sendCommand in terminalService if there is no cancellation token', async () => {
@@ -107,6 +108,7 @@ suite('Terminal Service (synchronous)', () => {
                 terminalService.sendCommand(
                     'python',
                     deepEqual([
+                        isolated.fileToCommandArgument(),
                         shellExecFile.fileToCommandArgument(),
                         'cmd'.fileToCommandArgument(),
                         '1',
@@ -149,6 +151,7 @@ suite('Terminal Service (synchronous)', () => {
                 terminalService.sendCommand(
                     'python',
                     deepEqual([
+                        isolated.fileToCommandArgument(),
                         shellExecFile.fileToCommandArgument(),
                         'cmd'.fileToCommandArgument(),
                         '1',

src/test/interpreters/activation/service.unit.test.ts

@@ -140,10 +140,13 @@ suite('Interpreters Activation - Python Environment Variables', () => {
 
                             const shellCmd = capture(processService.shellExec).first()[0];
 
+                            const isolated = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'pyvsc-run-isolated.py');
                             const printEnvPyFile = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'printEnvVariables.py');
-                            const expectedCommand = `${cmd.join(
-                                ' && '
-                            )} && echo '${getEnvironmentPrefix}' && python ${printEnvPyFile.fileToCommandArgument()}`;
+                            const expectedCommand = [
+                                ...cmd,
+                                `echo '${getEnvironmentPrefix}'`,
+                                `python ${isolated} ${printEnvPyFile.fileToCommandArgument()}`
+                            ].join(' && ');
 
                             expect(shellCmd).to.equal(expectedCommand);
                         });

src/test/interpreters/activation/terminalEnvironmentActivationService.unit.test.ts

@@ -95,6 +95,7 @@ suite('Interpreters Activation - Python Environment Variables (using terminals)'
                     });
                     test('Should execute python file in terminal (that is what dumps variables into json)', async () => {
                         when(envVarsProvider.getCustomEnvironmentVariables(resource)).thenResolve(undefined);
+                        const isolated = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'pyvsc-run-isolated.py');
                         const pyFile = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'printEnvVariablesToFile.py');
 
                         await envActivationService.getActivatedEnvironmentVariables(resource, interpreter);
@@ -103,7 +104,11 @@ suite('Interpreters Activation - Python Environment Variables (using terminals)'
                         verify(
                             terminal.sendCommand(
                                 cmd,
-                                deepEqual([pyFile.fileToCommandArgument(), jsonFile.fileToCommandArgument()]),
+                                deepEqual([
+                                    isolated.fileToCommandArgument(),
+                                    pyFile.fileToCommandArgument(),
+                                    jsonFile.fileToCommandArgument()
+                                ]),
                                 anything(),
                                 false
                             )

src/test/testing/common/debugLauncher.unit.test.ts

@@ -207,8 +207,8 @@ suite('Unit Tests - Debug Launcher', () => {
             expected = getDefaultDebugConfig();
         }
         expected.rules = [{ path: path.join(EXTENSION_ROOT_DIR, 'pythonFiles'), include: false }];
-        expected.program = testLaunchScript;
-        expected.args = options.args;
+        expected.program = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'pyvsc-run-isolated.py');
+        expected.args = [testLaunchScript, ...options.args];
         if (!expected.cwd) {
             expected.cwd = workspaceFolders[0].uri.fsPath;
         }

src/test/testing/navigation/symbolNavigator.unit.test.ts

@@ -86,7 +86,11 @@ suite('Unit Tests - Navigation Command Handler', () => {
     });
     test('Ensure no symbols are returned when there are no symbols to be returned', async () => {
         const docUri = Uri.file(__filename);
-        const args = [path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'symbolProvider.py'), docUri.fsPath];
+        const args = [
+            path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'pyvsc-run-isolated.py'),
+            path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'symbolProvider.py'),
+            docUri.fsPath
+        ];
         const proc: ExecutionResult<string> = {
             stdout: JSON.stringify({ classes: [], methods: [], functions: [] })
         };
@@ -114,7 +118,11 @@ suite('Unit Tests - Navigation Command Handler', () => {
     });
     test('Ensure symbols are returned', async () => {
         const docUri = Uri.file(__filename);
-        const args = [path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'symbolProvider.py'), docUri.fsPath];
+        const args = [
+            path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'pyvsc-run-isolated.py'),
+            path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'symbolProvider.py'),
+            docUri.fsPath
+        ];
         const proc: ExecutionResult<string> = {
             stdout: JSON.stringify({
                 classes: [