switch to version that adapts based on os

Author: Hweinstock

packages/core/src/test/shared/utilities/pathFind.test.ts

@@ -46,11 +46,11 @@ describe('pathFind', function () {
         let previousPath: string
 
         beforeEach(function () {
-            previousPath = testutil.copyEnv().PATH!
+            previousPath = testutil.getEnvPath(testutil.copyEnv())
         })
 
         afterEach(function () {
-            process.env.PATH = previousPath
+            testutil.setEnvPath(previousPath)
         })
 
         it('first tries ssh in $PATH (Non-Windows)', async function () {
@@ -61,7 +61,7 @@ describe('pathFind', function () {
             const workspace = await testutil.createTestWorkspaceFolder()
             const fakeSshPath = path.join(workspace.uri.fsPath, `ssh`)
 
-            process.env.PATH = workspace.uri.fsPath
+            testutil.setEnvPath(workspace.uri.fsPath)
             const firstResult = await findSshPath(false)
 
             await testutil.createExecutableFile(fakeSshPath, '')
@@ -80,7 +80,7 @@ describe('pathFind', function () {
             const workspace = await testutil.createTestWorkspaceFolder()
             const fakeSshPath = path.join(workspace.uri.fsPath, `ssh`)
 
-            process.env.PATH = workspace.uri.fsPath
+            testutil.setEnvPath(workspace.uri.fsPath)
 
             await testutil.createExecutableFile(fakeSshPath, '')
 
@@ -99,7 +99,7 @@ describe('pathFind', function () {
             // We move the ssh to a temp directory temporarily to test if cache works.
             const fakeSshPath = path.join(workspace.uri.fsPath, `ssh`)
 
-            process.env.PATH = workspace.uri.fsPath
+            testutil.setEnvPath(workspace.uri.fsPath)
 
             await testutil.createExecutableFile(fakeSshPath, '')
 

packages/core/src/test/shared/utilities/testUtils.test.ts

@@ -3,20 +3,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import assert from 'assert'
-import { createExecutableFile, createTestWorkspaceFolder, copyEnv } from '../../testUtil'
+import { createExecutableFile, createTestWorkspaceFolder, copyEnv, setEnvPath, getEnvPath } from '../../testUtil'
 import path from 'path'
 import { fs } from '../../../shared'
 import { isWin } from '../../../shared/vscode/env'
 import { tryRun } from '../../../shared/utilities/pathFind'
 
 describe('setEnv', function () {
     it('modifies the node environment variables', function () {
-        const originalPath = copyEnv().PATH
+        const originalPath = getEnvPath(copyEnv())
         const fakePath = 'fakePath'
-        process.env.PATH = fakePath
+        setEnvPath(fakePath)
         assert.strictEqual(copyEnv().PATH, fakePath)
 
-        process.env.PATH = originalPath
+        setEnvPath(originalPath)
         assert.strictEqual(copyEnv().PATH, originalPath)
     })
 })

packages/core/src/test/testUtil.ts

@@ -19,6 +19,7 @@ import { mkdirSync, existsSync } from 'fs' // eslint-disable-line no-restricted-
 import { randomBytes } from 'crypto'
 import request from '../shared/request'
 import { stub } from 'sinon'
+import { isWin } from '../shared/vscode/env'
 
 const testTempDirs: string[] = []
 
@@ -634,3 +635,21 @@ export function getFetchStubWithResponse(response: Partial<Response>) {
 export function copyEnv(): NodeJS.ProcessEnv {
     return { ...process.env }
 }
+
+/**
+ * Returns the PATH env variable regardless of OS.
+ * Appears that env.PATH doesn't work on widows and instead expects env.Path.
+ * @param env NodeJs env
+ * @returns PATH var (not a copy)
+ */
+export function getEnvPath(env: NodeJS.ProcessEnv): string {
+    return (isWin() ? env.Path : env.PATH) || ''
+}
+
+export function setEnvPath(newPath: string): void {
+    if (isWin()) {
+        process.env.Path = newPath
+    } else {
+        process.env.PATH = newPath
+    }
+}