refactor to shallow copy

Author: Hweinstock

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

@@ -46,11 +46,11 @@ describe('pathFind', function () {
         let previousEnv: NodeJS.ProcessEnv
 
         beforeEach(function () {
-            previousEnv = testutil.readEnv()
+            previousEnv = testutil.copyEnv()
         })
 
         afterEach(function () {
-            testutil.setEnv(previousEnv)
+            process.env = previousEnv
         })
 
         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`)
 
-            testutil.setEnv(testutil.envWithNewPath(workspace.uri.fsPath))
+            process.env = testutil.envWithNewPath(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`)
 
-            testutil.setEnv(testutil.envWithNewPath(workspace.uri.fsPath))
+            process.env = testutil.envWithNewPath(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`)
 
-            testutil.setEnv(testutil.envWithNewPath(workspace.uri.fsPath))
+            process.env = testutil.envWithNewPath(workspace.uri.fsPath)
 
             await testutil.createExecutableFile(fakeSshPath, '')
 

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import assert from 'assert'
-import { createExecutableFile, createTestWorkspaceFolder, envWithNewPath, readEnv, setEnv } from '../../testUtil'
+import { createExecutableFile, createTestWorkspaceFolder, envWithNewPath, copyEnv } from '../../testUtil'
 import path from 'path'
 import { fs } from '../../../shared'
 import { isWin } from '../../../shared/vscode/env'
@@ -18,13 +18,13 @@ describe('envWithNewPath', function () {
 
 describe('setEnv', function () {
     it('modifies the node environment variables', function () {
-        const originalEnv = readEnv()
+        const originalEnv = copyEnv()
         const fakePath = 'fakePath'
-        setEnv(envWithNewPath('fakePath'))
-        assert.strictEqual(readEnv().PATH, fakePath)
+        process.env = envWithNewPath('fakePath')
+        assert.strictEqual(copyEnv().PATH, fakePath)
 
-        setEnv(originalEnv)
-        assert.deepStrictEqual(readEnv(), originalEnv)
+        process.env = originalEnv
+        assert.deepStrictEqual(copyEnv(), originalEnv)
     })
 })
 

packages/core/src/test/testUtil.ts

@@ -615,11 +615,7 @@ export function getFetchStubWithResponse(response: Partial<Response>) {
     return stub(request, 'fetch').returns({ response: new Promise((res, _) => res(response)) } as any)
 }
 
-export function setEnv(newEnv: NodeJS.ProcessEnv): void {
-    process.env = newEnv
-}
-
-export function readEnv(): NodeJS.ProcessEnv {
+export function copyEnv(): NodeJS.ProcessEnv {
     return { ...process.env }
 }