mirror/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-01-13 12:30:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
Pedro Algarvio
2018-12-27 12:03:09 +00:00
parent 79c8b1fceb
commit 8ffd1f69d7
2 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pre_commit/commands/run.py
View File

@@ -77,16 +77,7 @@ def _run_single_hook(filenames, hook, repo, args, skips, cols):
'replacement.'.format(hook['id'], repo.repo_config['repo']),
)
if hook['id'] in skips:
output.write(get_hook_message(
_hook_msg_start(hook, args.verbose),
end_msg=SKIPPED,
end_color=color.YELLOW,
use_color=args.color,
cols=cols,
))
return 0
elif hook['alias'] and hook['alias'] in skips:
if hook['id'] in skips or hook['alias'] in skips:
output.write(get_hook_message(
_hook_msg_start(hook, args.verbose),
end_msg=SKIPPED,

40
tests/commands/run_test.py
View File

@@ -42,6 +42,18 @@ def repo_with_failing_hook(tempdir_factory):
yield git_path
@pytest.fixture
def aliased_repo(tempdir_factory):
git_path = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
with cwd(git_path):
with modify_config() as config:
config['repos'][0]['hooks'].append(
{'id': 'bash_hook', 'alias': 'foo_bash'},
)
stage_a_file()
yield git_path
def stage_a_file(filename='foo.py'):
open(filename, 'a').close()
cmd_output('git', 'add', filename)
@@ -388,17 +400,9 @@ def test_skip_hook(cap_out, store, repo_with_passing_hook):
assert msg in printed
def test_skip_aliased_hook(cap_out, store, repo_with_passing_hook):
with cwd(repo_with_passing_hook):
# Add bash hook on there again, aliased
with modify_config() as config:
config['repos'][0]['hooks'].append(
{'id': 'bash_hook', 'alias': 'foo_bash'},
)
stage_a_file()
def test_skip_aliased_hook(cap_out, store, aliased_repo):
ret, printed = _do_run(
cap_out, store, repo_with_passing_hook,
cap_out, store, aliased_repo,
run_opts(hook='bash_hook'),
{'SKIP': 'bash_hook'},
)
@@ -409,7 +413,7 @@ def test_skip_aliased_hook(cap_out, store, repo_with_passing_hook):
assert msg in printed
ret, printed = _do_run(
cap_out, store, repo_with_passing_hook,
cap_out, store, aliased_repo,
run_opts(hook='foo_bash'),
{'SKIP': 'foo_bash'},
)
@@ -448,17 +452,9 @@ def test_multiple_hooks_same_id(cap_out, store, repo_with_passing_hook):
assert output.count(b'Bash hook') == 2
def test_aliased_hook_run(cap_out, store, repo_with_passing_hook):
with cwd(repo_with_passing_hook):
# Add bash hook on there again, aliased
with modify_config() as config:
config['repos'][0]['hooks'].append(
{'id': 'bash_hook', 'alias': 'foo_bash'},
)
stage_a_file()
def test_aliased_hook_run(cap_out, store, aliased_repo):
ret, output = _do_run(
cap_out, store, repo_with_passing_hook,
cap_out, store, aliased_repo,
run_opts(verbose=True, hook='bash_hook'),
)
assert ret == 0
@@ -466,7 +462,7 @@ def test_aliased_hook_run(cap_out, store, repo_with_passing_hook):
assert output.count(b'Bash hook') == 2
ret, output = _do_run(
cap_out, store, repo_with_passing_hook,
cap_out, store, aliased_repo,
run_opts(verbose=True, hook='foo_bash'),
)
assert ret == 0