Skip to content

Commit 12346e6

Browse files
committed
should just use django_db_modify_db_settings_parallel_suffix
1 parent 399843d commit 12346e6

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

pytest_django/fixtures.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def django_db_modify_db_settings_xdist_suffix(request):
4747

4848

4949
@pytest.fixture(scope="session")
50-
def django_db_modify_db_settings_suffix(
50+
def django_db_modify_db_settings_parallel_suffix(
5151
django_db_modify_db_settings_tox_suffix,
5252
django_db_modify_db_settings_xdist_suffix
5353
):
@@ -66,13 +66,6 @@ def django_db_modify_db_settings_suffix(
6666
_set_suffix_to_test_databases(suffix=suffix)
6767

6868

69-
@pytest.fixture(scope="session")
70-
def django_db_modify_db_settings_parallel_suffix(
71-
django_db_modify_db_settings_suffix,
72-
):
73-
skip_if_no_django()
74-
75-
7669
@pytest.fixture(scope="session")
7770
def django_db_modify_db_settings(django_db_modify_db_settings_parallel_suffix):
7871
skip_if_no_django()

pytest_django/plugin.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
from .fixtures import django_db_modify_db_settings_parallel_suffix # noqa
2626
from .fixtures import django_db_modify_db_settings_tox_suffix # noqa
2727
from .fixtures import django_db_modify_db_settings_xdist_suffix # noqa
28-
from .fixtures import django_db_modify_db_settings_suffix # noqa
2928
from .fixtures import _live_server_helper # noqa
3029
from .fixtures import admin_client # noqa
3130
from .fixtures import admin_user # noqa

0 commit comments

Comments
 (0)