From 412091c1e06cd58dc0bacfdc5bcc07449ebd20c0 Mon Sep 17 00:00:00 2001
From: mayeut <mayeut@users.noreply.github.com>
Date: Sat, 2 Jul 2022 11:40:53 +0200
Subject: [PATCH] Fix tests for update-environment==false

---
 __tests__/find-pypy.test.ts | 4 ++++
 __tests__/finder.test.ts    | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/__tests__/find-pypy.test.ts b/__tests__/find-pypy.test.ts
index 04a27cf3c..3da9a226e 100644
--- a/__tests__/find-pypy.test.ts
+++ b/__tests__/find-pypy.test.ts
@@ -151,8 +151,11 @@ describe('findPyPyVersion', () => {
   let spyChmodSync: jest.SpyInstance;
   let spyCoreAddPath: jest.SpyInstance;
   let spyCoreExportVariable: jest.SpyInstance;
+  const env = process.env;
 
   beforeEach(() => {
+    jest.resetModules();
+    process.env = {...env};
     tcFind = jest.spyOn(tc, 'find');
     tcFind.mockImplementation((tool: string, version: string) => {
       const semverRange = new semver.Range(version);
@@ -214,6 +217,7 @@ describe('findPyPyVersion', () => {
     jest.resetAllMocks();
     jest.clearAllMocks();
     jest.restoreAllMocks();
+    process.env = env;
   });
 
   it('found PyPy in toolcache', async () => {
diff --git a/__tests__/finder.test.ts b/__tests__/finder.test.ts
index cf07a234d..3bd279f11 100644
--- a/__tests__/finder.test.ts
+++ b/__tests__/finder.test.ts
@@ -28,10 +28,12 @@ const manifestData = require('./data/versions-manifest.json');
 describe('Finder tests', () => {
   let spyCoreAddPath: jest.SpyInstance;
   let spyCoreExportVariable: jest.SpyInstance;
+  const env = process.env;
 
   beforeEach(() => {
+    jest.resetModules();
+    process.env = {...env};
     spyCoreAddPath = jest.spyOn(core, 'addPath');
-
     spyCoreExportVariable = jest.spyOn(core, 'exportVariable');
   });
 
@@ -39,6 +41,7 @@ describe('Finder tests', () => {
     jest.resetAllMocks();
     jest.clearAllMocks();
     jest.restoreAllMocks();
+    process.env = env;
   });
 
   it('Finds Python if it is installed', async () => {
@@ -66,7 +69,6 @@ describe('Finder tests', () => {
     await finder.useCpythonVersion('3.x', 'x64', false);
     expect(spyCoreAddPath).not.toHaveBeenCalled();
     expect(spyCoreExportVariable).not.toHaveBeenCalled();
-    expect(spyCoreExportVariable).not.toHaveBeenCalled();
   });
 
   it('Finds stable Python version if it is not installed, but exists in the manifest', async () => {