renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-13 07:26:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix(pip-compile): Correctly report errors when a lock file is unchanged (#29363)

Browse source
This commit is contained in:
Miles Budnek 2024-05-31 01:19:04 -04:00 committed by GitHub
parent 4313b9b329
commit 635854e321
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 42 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/modules/manager/pip-compile/artifacts.spec.ts
View file

@ -1,7 +1,11 @@
import { codeBlock } from 'common-tags'; import { codeBlock } from 'common-tags';
import { mockDeep } from 'jest-mock-extended'; import { mockDeep } from 'jest-mock-extended';
import { join } from 'upath'; import { join } from 'upath';
import { envMock, mockExecAll } from '../../../../test/exec-util'; import {
envMock,
mockExecAll,
mockExecSequence,
} from '../../../../test/exec-util';
import { Fixtures } from '../../../../test/fixtures'; import { Fixtures } from '../../../../test/fixtures';
import { env, fs, git, mocked, partial } from '../../../../test/util'; import { env, fs, git, mocked, partial } from '../../../../test/util';
import { GlobalConfig } from '../../../config/global'; import { GlobalConfig } from '../../../config/global';
@ -80,7 +84,7 @@ describe('modules/manager/pip-compile/artifacts', () => {
expect(execSnapshots).toEqual([]); expect(execSnapshots).toEqual([]);
}); });
it('returns null if unchanged', async () => { it('returns null if all unchanged', async () => {
fs.readLocalFile.mockResolvedValueOnce(simpleHeader); fs.readLocalFile.mockResolvedValueOnce(simpleHeader);
const execSnapshots = mockExecAll(); const execSnapshots = mockExecAll();
fs.readLocalFile.mockResolvedValueOnce('new lock'); fs.readLocalFile.mockResolvedValueOnce('new lock');
@ -615,5 +619,32 @@ describe('modules/manager/pip-compile/artifacts', () => {
'pip-compile --output-file=requirements.txt requirements.in --upgrade-package=foo==1.0.2 --upgrade-package=bar==2.0.0', 'pip-compile --output-file=requirements.txt requirements.in --upgrade-package=foo==1.0.2 --upgrade-package=bar==2.0.0',
); );
}); });
it('reports errors when a lock file is unchanged', async () => {
fs.readLocalFile.mockResolvedValue(simpleHeader);
mockExecSequence([
new Error('Oh noes!'),
{ stdout: 'This one worked', stderr: '' },
]);
git.getRepoStatus.mockResolvedValue(
partial<StatusResult>({
modified: [],
}),
);
const results = await updateArtifacts({
packageFileName: 'requirements.in',
updatedDeps: [],
newPackageFileContent: 'some new content',
config: {
...config,
lockFiles: ['requirements1.txt', 'requirements2.txt'],
},
});
expect(results).toMatchObject([
{
artifactError: { lockFile: 'requirements1.txt', stderr: 'Oh noes!' },
},
]);
});
}); });
}); });

7
lib/modules/manager/pip-compile/artifacts.ts
View file

@ -125,9 +125,7 @@ export async function updateArtifacts({
logger.trace({ env: execOptions.extraEnv }, 'pip-compile extra env vars'); logger.trace({ env: execOptions.extraEnv }, 'pip-compile extra env vars');
await exec(cmd, execOptions); await exec(cmd, execOptions);
const status = await getRepoStatus(); const status = await getRepoStatus();
if (!status?.modified.includes(outputFileName)) { if (status?.modified.includes(outputFileName)) {
return null;
}
result.push({ result.push({
file: { file: {
type: 'addition', type: 'addition',
@ -135,6 +133,7 @@ export async function updateArtifacts({
contents: await readLocalFile(outputFileName, 'utf8'), contents: await readLocalFile(outputFileName, 'utf8'),
}, },
}); });
}
} catch (err) { } catch (err) {
// istanbul ignore if // istanbul ignore if
if (err.message === TEMPORARY_ERROR) { if (err.message === TEMPORARY_ERROR) {
@ -150,5 +149,5 @@ export async function updateArtifacts({
} }
} }
logger.debug('pip-compile: Returning updated output file(s)'); logger.debug('pip-compile: Returning updated output file(s)');
return result; return result.length === 0 ? null : result;
} }