pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-07 12:26:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add negative test cases for various git artifacts.

Browse source
This commit is contained in:
Chris Keele 2021-04-11 02:44:34 -07:00
parent 8993f10466
commit 0c6a81a69f
2 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pre_commit_hooks/check_merge_conflict.py
View file

@ -7,8 +7,9 @@ from typing import Sequence
CONFLICT_PATTERNS = [ CONFLICT_PATTERNS = [
b'<<<<<<< ', b'<<<<<<< ',
b'======= ', b'======= ',
b'||||||| ',
b'=======\n', b'=======\n',
b'||||||| ',
b'|||||||\n',
b'>>>>>>> ', b'>>>>>>> ',
] ]

24
tests/check_merge_conflict_test.py
View file

@ -129,8 +129,32 @@ def test_does_not_care_when_not_in_a_merge(tmpdir):
f.write_binary(b'problem\n=======\n') f.write_binary(b'problem\n=======\n')
assert main([str(f.realpath())]) == 0 assert main([str(f.realpath())]) == 0
f = tmpdir.join('README.md')
f.write_binary(b'problem\n======= \n')
assert main([str(f.realpath())]) == 0
f = tmpdir.join('README.md')
f.write_binary(b'problem\n|||||||\n')
assert main([str(f.realpath()), '--assume-in-merge']) == 0
f = tmpdir.join('README.md')
f.write_binary(b'problem\n||||||| \n')
assert main([str(f.realpath()), '--assume-in-merge']) == 0
def test_care_when_assumed_merge(tmpdir): def test_care_when_assumed_merge(tmpdir):
f = tmpdir.join('README.md') f = tmpdir.join('README.md')
f.write_binary(b'problem\n=======\n') f.write_binary(b'problem\n=======\n')
assert main([str(f.realpath()), '--assume-in-merge']) == 1 assert main([str(f.realpath()), '--assume-in-merge']) == 1
f = tmpdir.join('README.md')
f.write_binary(b'problem\n======= \n')
assert main([str(f.realpath()), '--assume-in-merge']) == 1
f = tmpdir.join('README.md')
f.write_binary(b'problem\n|||||||\n')
assert main([str(f.realpath()), '--assume-in-merge']) == 1
f = tmpdir.join('README.md')
f.write_binary(b'problem\n||||||| \n')
assert main([str(f.realpath()), '--assume-in-merge']) == 1