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

Merge d3a93e6d1e into 5bf6c09bfa

Browse source
This commit is contained in:
Anthony Sottile 2017-04-19 13:31:03 +00:00 • committed by GitHub
commit b5adb5b4fe
2 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/check_merge_conflict_test.py
View file

@ -5,11 +5,11 @@ import os
import shutil
import pytest
from py.path import local
from pre_commit_hooks.check_merge_conflict import detect_merge_conflict
from pre_commit_hooks.util import cmd_output
from testing.util import get_resource_path
from testing.util import write_file
@pytest.yield_fixture
@ -103,7 +103,7 @@ def test_merge_conflicts_git():
)
@pytest.mark.usefixtures('repository_is_pending_merge')
def test_merge_conflicts_failing(failing_contents):
write_file('f2', failing_contents)
local('f2').write(failing_contents)
assert detect_merge_conflict(['f2']) == 1
@ -112,7 +112,7 @@ def test_merge_conflicts_failing(failing_contents):
)
@pytest.mark.usefixtures('f1_is_a_conflict_file')
def test_merge_conflicts_ok(ok_contents):
write_file('f1', ok_contents)
local('f1').write(ok_contents)
assert detect_merge_conflict(['f1']) == 0