From 412091c1e06cd58dc0bacfdc5bcc07449ebd20c0 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 2 Jul 2022 11:40:53 +0200 Subject: [PATCH 1/2] 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 04a27cf3..3da9a226 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 cf07a234..3bd279f1 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 () => { From 2c9de4ed413bf4466f2fde83041579ed45167427 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 2 Jul 2022 11:50:26 +0200 Subject: [PATCH 2/2] Remove duplicate code introduced in #440 #440 duplicated a block of code outside of `if (updateEnvironment) {` condition. This was probably an oversight when merging `main` back on the PR branch. The tests should have seen that `core.exportVariable` was being called and should have failed. --- dist/setup/index.js | 9 --------- src/find-python.ts | 11 ----------- 2 files changed, 20 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index f1c0ac3a..d58c75f3 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -64845,15 +64845,6 @@ function useCpythonVersion(version, architecture, updateEnvironment) { `The list of all available versions can be found here: ${installer.MANIFEST_URL}` ].join(os.EOL)); } - if (utils_1.IS_LINUX) { - const libPath = process.env.LD_LIBRARY_PATH - ? `:${process.env.LD_LIBRARY_PATH}` - : ''; - const pyLibPath = path.join(installDir, 'lib'); - if (!libPath.split(':').includes(pyLibPath)) { - core.exportVariable('LD_LIBRARY_PATH', pyLibPath + libPath); - } - } const _binDir = binDir(installDir); const binaryExtension = utils_1.IS_WINDOWS ? '.exe' : ''; const pythonPath = path.join(utils_1.IS_WINDOWS ? installDir : _binDir, `python${binaryExtension}`); diff --git a/src/find-python.ts b/src/find-python.ts index 8c085d61..e1add953 100644 --- a/src/find-python.ts +++ b/src/find-python.ts @@ -70,17 +70,6 @@ export async function useCpythonVersion( ); } - if (IS_LINUX) { - const libPath = process.env.LD_LIBRARY_PATH - ? `:${process.env.LD_LIBRARY_PATH}` - : ''; - const pyLibPath = path.join(installDir, 'lib'); - - if (!libPath.split(':').includes(pyLibPath)) { - core.exportVariable('LD_LIBRARY_PATH', pyLibPath + libPath); - } - } - const _binDir = binDir(installDir); const binaryExtension = IS_WINDOWS ? '.exe' : ''; const pythonPath = path.join(