Merging upstream version 3.6.0.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
391b92c4f9
commit
04fadfcf8e
55 changed files with 266 additions and 248 deletions
|
@ -349,8 +349,9 @@ def test_install_existing_hooks_no_overwrite(tempdir_factory, store):
|
|||
# We should run both the legacy and pre-commit hooks
|
||||
ret, output = _get_commit_output(tempdir_factory)
|
||||
assert ret == 0
|
||||
assert output.startswith('legacy hook\n')
|
||||
NORMAL_PRE_COMMIT_RUN.assert_matches(output[len('legacy hook\n'):])
|
||||
legacy = 'legacy hook\n'
|
||||
assert output.startswith(legacy)
|
||||
NORMAL_PRE_COMMIT_RUN.assert_matches(output.removeprefix(legacy))
|
||||
|
||||
|
||||
def test_legacy_overwriting_legacy_hook(tempdir_factory, store):
|
||||
|
@ -375,8 +376,9 @@ def test_install_existing_hook_no_overwrite_idempotent(tempdir_factory, store):
|
|||
# We should run both the legacy and pre-commit hooks
|
||||
ret, output = _get_commit_output(tempdir_factory)
|
||||
assert ret == 0
|
||||
assert output.startswith('legacy hook\n')
|
||||
NORMAL_PRE_COMMIT_RUN.assert_matches(output[len('legacy hook\n'):])
|
||||
legacy = 'legacy hook\n'
|
||||
assert output.startswith(legacy)
|
||||
NORMAL_PRE_COMMIT_RUN.assert_matches(output.removeprefix(legacy))
|
||||
|
||||
|
||||
def test_install_with_existing_non_utf8_script(tmpdir, store):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue