pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-05 11:36:54 +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-09-29 22:57:56 +00:00
parent e84a88e334
commit afb503ed4d
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/check_case_conflict_test.py
View file

@ -14,8 +14,8 @@ skip_win32 = pytest.mark.skipif(
) )
skip_darwin = pytest.mark_skipif( skip_darwin = pytest.mark_skipif(
sys.platform == "darwin", sys.platform == 'darwin',
reason = 'case conflicts between directories and files' reason='case conflicts between directories and files',
) )
@ -50,7 +50,7 @@ def test_adding_something_with_conflict(temp_git_dir):
@skip_win32 # pragma: win32 no cover @skip_win32 # pragma: win32 no cover
@skip_darwin # pragma: MacOS no cover @skip_darwin # pragma: MacOS 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():
temp_git_dir.mkdir('dir').join('x').write('foo') temp_git_dir.mkdir('dir').join('x').write('foo')
@ -61,7 +61,7 @@ def test_adding_files_with_conflicting_directories(temp_git_dir):
@skip_win32 # pragma: win32 no cover @skip_win32 # pragma: win32 no cover
@skip_darwin # pragma: MacOS no cover @skip_darwin # pragma: MacOS 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():
temp_git_dir.mkdir('x').mkdir('y').join('z').write('foo') temp_git_dir.mkdir('x').mkdir('y').join('z').write('foo')
@ -72,7 +72,7 @@ def test_adding_files_with_conflicting_deep_directories(temp_git_dir):
@skip_win32 # pragma: win32 no cover @skip_win32 # pragma: win32 no cover
@skip_darwin # pragma: MacOS no cover @skip_darwin # pragma: MacOS 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():
temp_git_dir.mkdir('dir').join('x').write('foo') temp_git_dir.mkdir('dir').join('x').write('foo')
@ -103,7 +103,7 @@ def test_file_conflicts_with_committed_file(temp_git_dir):
@skip_win32 # pragma: win32 no cover @skip_win32 # pragma: win32 no cover
@skip_darwin # pragma: MacOS no cover @skip_darwin # pragma: MacOS 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():
temp_git_dir.mkdir('dir').join('x').write('foo') temp_git_dir.mkdir('dir').join('x').write('foo')