summaryrefslogtreecommitdiffstats
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-07-17 07:38:11 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-07-17 07:38:11 +0000
commitd1801d1e6f670f245e0deb5edde46e1daf131c78 (patch)
tree87972441ed083bdd8ae4f511388bd4acc0a85988 /tests/conftest.py
parentAdding upstream version 2.12.1. (diff)
downloadpre-commit-d1801d1e6f670f245e0deb5edde46e1daf131c78.tar.xz
pre-commit-d1801d1e6f670f245e0deb5edde46e1daf131c78.zip
Adding upstream version 2.13.0.upstream/2.13.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index b36ce5a..f38f969 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -90,8 +90,8 @@ def _make_conflict():
@pytest.fixture
def in_merge_conflict(tempdir_factory):
path = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
- open(os.path.join(path, 'dummy'), 'a').close()
- cmd_output('git', 'add', 'dummy', cwd=path)
+ open(os.path.join(path, 'placeholder'), 'a').close()
+ cmd_output('git', 'add', 'placeholder', cwd=path)
git_commit(msg=in_merge_conflict.__name__, cwd=path)
conflict_path = tempdir_factory.get()