8000 Add OS info to the error message by MaksimZhukov · Pull Request #559 · actions/setup-python · GitHub
[go: up one dir, main page]
Skip to content

Add OS info to the error message #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Dec 7, 2022
Merged

Add OS info to the error message #559

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6c87c81
Add OS info to the error message
MaksimZhukov Dec 5, 2022
7c97a81
Improve the error message
MaksimZhukov Dec 5, 2022
d9a075e
Format the code
MaksimZhukov Dec 5, 2022
1d95b40
Regenerate the dist folder
MaksimZhukov Dec 6, 2022
d4d6125
Add try catch
MaksimZhukov Dec 6, 2022
c09af9d
Get rid of the duplicate
MaksimZhukov Dec 7, 2022
a8c419b
Regenerate the dist folder
MaksimZhukov Dec 7, 2022
3d2a56a
Update tests
MaksimZhukov Dec 7, 2022
d9928f8
Fix tests
MaksimZhukov Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix tests
  • Loading branch information
@MaksimZhukov
MaksimZhukov committed Dec 7, 2022
commit d9928f85a748d3f402241f233e442b35b148e953
13 changes: 4 additions & 9 deletions __tests__/cache-restore.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ virtualenvs.path = "{cache-dir}/virtualenvs" # /Users/patrick/Library/Caches/py
let saveSatetSpy: jest.SpyInstance;
let getStateSpy: jest.SpyInstance;
let setOutputSpy: jest.SpyInstance;
let getLinuxInfoSpy: jest.SpyInstance;

// cache spy
let restoreCacheSpy: jest.SpyInstance;
Expand Down Expand Up @@ -67,6 +66,9 @@ virtualenvs.path = "{cache-dir}/virtualenvs" # /Users/patrick/Library/Caches/py
if (input.includes('poetry')) {
return {stdout: poetryConfigOutput, stderr: '', exitCode: 0};
}
if (input.includes('lsb_release')) {
return {stdout: 'Ubuntu\n20.04', stderr: '', exitCode: 0};
}

return {stdout: '', stderr: 'Error occured', exitCode: 2};
});
Expand All @@ -83,7 +85,6 @@ virtualenvs.path = "{cache-dir}/virtualenvs" # /Users/patrick/Library/Caches/py

whichSpy = jest.spyOn(io, 'which');
whichSpy.mockImplementation(() => '/path/to/python');
getLinuxInfoSpy = jest.spyOn(utils, 'getLinuxInfo');
});

describe('Validate provided package manager', () => {
Expand Down Expand Up @@ -120,17 +121,11 @@ virtualenvs.path = "{cache-dir}/virtualenvs" # /Users/patrick/Library/Caches/py
dependencyFile
6810 );

if (process.platform === 'linux') {
getLinuxInfoSpy.mockImplementation(() =>
Promise.resolve({osName: 'Ubuntu', osVersion: '20.04'})
);
}

await cacheDistributor.restoreCache();

if (process.platform === 'linux' && packageManager === 'pip') {
expect(infoSpy).toHaveBeenCalledWith(
`Cache restored from key: setup-python-${process.env['RUNNER_OS']}-Ubuntu-20.04-python-${pythonVersion}-${packageManager}-${fileHash}`
`Cache restored from key: setup-python-${process.env['RUNNER_OS']}-20.04-Ubuntu-python-${pythonVersion}-${packageManager}-${fileHash}`
);
} else {
expect(infoSpy).toHaveBeenCalledWith(
Expand Down
0