third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-19 17:14:43 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #317 from pre-commit/modify_config_testing_helper

Browse source 
Remove adding config file in one place
This commit is contained in:
Anthony Sottile 2015-12-09 14:42:07 -08:00
commit 336939ef99
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/conftest.py
View file

@ -9,7 +9,6 @@ import os.path
import mock import mock
import pytest import pytest
import pre_commit.constants as C
from pre_commit import five from pre_commit import five
from pre_commit.prefixed_command_runner import PrefixedCommandRunner from pre_commit.prefixed_command_runner import PrefixedCommandRunner
from pre_commit.runner import Runner from pre_commit.runner import Runner
@ -47,7 +46,6 @@ def in_merge_conflict(tempdir_factory):
with cwd(path): with cwd(path):
cmd_output('touch', 'dummy') cmd_output('touch', 'dummy')
cmd_output('git', 'add', 'dummy') cmd_output('git', 'add', 'dummy')
cmd_output('git', 'add', C.CONFIG_FILE)
cmd_output('git', 'commit', '-m', 'Add config.') cmd_output('git', 'commit', '-m', 'Add config.')
conflict_path = tempdir_factory.get() conflict_path = tempdir_factory.get()