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

[pre-commit.ci] auto fixes from pre-commit.com hooks

Browse source 
for more information, see https://pre-commit.ci
This commit is contained in:
pre-commit-ci[bot] 2021-12-01 18:11:05 +00:00
parent a603c6073e
commit 30db9f6461
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/check_case_conflict_test.py
View file

@ -18,6 +18,7 @@ skip_darwin = pytest.mark.skipif(
reason='case conflicts between directories and files', reason='case conflicts between directories and files',
) )
def test_parents(): def test_parents():
assert set(parents('a')) == set() assert set(parents('a')) == set()
assert set(parents('a/b')) == {'a'} assert set(parents('a/b')) == {'a'}
@ -48,7 +49,7 @@ def test_adding_something_with_conflict(temp_git_dir):
assert find_conflicting_filenames(['f.py', 'F.py']) == 1 assert find_conflicting_filenames(['f.py', 'F.py']) == 1
@skip_darwin # pragma: darwin no cover @skip_darwin # pragma: darwin no cover
@skip_win32 # pragma: win32 no cover @skip_win32 # pragma: win32 no cover
def test_adding_files_with_conflicting_directories(temp_git_dir): def test_adding_files_with_conflicting_directories(temp_git_dir):
with temp_git_dir.as_cwd(): with temp_git_dir.as_cwd():
@ -59,7 +60,7 @@ def test_adding_files_with_conflicting_directories(temp_git_dir):
assert find_conflicting_filenames([]) == 1 assert find_conflicting_filenames([]) == 1
@skip_darwin # pragma: darwin no cover @skip_darwin # pragma: darwin no cover
@skip_win32 # pragma: win32 no cover @skip_win32 # pragma: win32 no cover
def test_adding_files_with_conflicting_deep_directories(temp_git_dir): def test_adding_files_with_conflicting_deep_directories(temp_git_dir):
with temp_git_dir.as_cwd(): with temp_git_dir.as_cwd():
@ -70,7 +71,7 @@ def test_adding_files_with_conflicting_deep_directories(temp_git_dir):
assert find_conflicting_filenames([]) == 1 assert find_conflicting_filenames([]) == 1
@skip_darwin # pragma: darwin no cover @skip_darwin # pragma: darwin no cover
@skip_win32 # pragma: win32 no cover @skip_win32 # pragma: win32 no cover
def test_adding_file_with_conflicting_directory(temp_git_dir): def test_adding_file_with_conflicting_directory(temp_git_dir):
with temp_git_dir.as_cwd(): with temp_git_dir.as_cwd():
@ -101,7 +102,7 @@ def test_file_conflicts_with_committed_file(temp_git_dir):
assert find_conflicting_filenames(['F.py']) == 1 assert find_conflicting_filenames(['F.py']) == 1
@skip_darwin # pragma: darwin no cover @skip_darwin # pragma: darwin no cover
@skip_win32 # pragma: win32 no cover @skip_win32 # pragma: win32 no cover
def test_file_conflicts_with_committed_dir(temp_git_dir): def test_file_conflicts_with_committed_dir(temp_git_dir):
with temp_git_dir.as_cwd(): with temp_git_dir.as_cwd():