pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-13 22:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace deprecated yield_fixture with fixture

Browse source 
Committed via https://github.com/asottile/all-repos
This commit is contained in:
Anthony Sottile 2018-01-21 15:31:23 -08:00
parent 0ddb3b8527
commit 4ab791497c
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/check_merge_conflict_test.py
View file

@ -12,7 +12,7 @@ from testing.util import get_resource_path
from testing.util import write_file
@pytest.yield_fixture
@pytest.fixture
def f1_is_a_conflict_file(tmpdir):
# Make a merge conflict
repo1 = tmpdir.join('repo1')
@ -67,7 +67,7 @@ def f1_is_a_conflict_file(tmpdir):
yield
@pytest.yield_fixture
@pytest.fixture
def repository_is_pending_merge(tmpdir):
# Make a (non-conflicting) merge
repo1 = tmpdir.join('repo1')