mirror of
https://github.com/pre-commit/pre-commit.git
synced 2026-02-19 09:04:41 +04:00
Use plumbum a bit better.
This commit is contained in:
parent
92aa55f44e
commit
7b1230df27
9 changed files with 44 additions and 44 deletions
|
|
@ -14,8 +14,8 @@ from testing.auto_namedtuple import auto_namedtuple
|
|||
|
||||
|
||||
def stage_a_file():
|
||||
local['touch']['foo.py']()
|
||||
local['git']['add', 'foo.py']()
|
||||
local['touch']('foo.py')
|
||||
local['git']('add', 'foo.py')
|
||||
|
||||
|
||||
def get_write_mock_output(write_mock):
|
||||
|
|
@ -153,7 +153,7 @@ def test_merge_conflict_modified(in_merge_conflict, mock_out_store_directory):
|
|||
|
||||
|
||||
def test_merge_conflict_resolved(in_merge_conflict, mock_out_store_directory):
|
||||
local['git']['add', '.']()
|
||||
local['git']('add', '.')
|
||||
ret, printed = _do_run(in_merge_conflict, _get_opts())
|
||||
for msg in ('Checking merge-conflict files only.', 'Bash hook', 'Passed'):
|
||||
assert msg in printed
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue