restored fixtures

Author: SalmonMode

pytest_django/fixtures.py

@@ -33,10 +33,27 @@
 
 
 @pytest.fixture(scope="session")
-def django_db_modify_db_settings_suffix():
+def django_db_modify_db_settings_tox_suffix():
     skip_if_no_django()
-    xdist_worker = getattr(request.config, "slaveinput", {}).get("slaveid")
-    tox_environment = os.getenv("TOX_PARALLEL_ENV")
+
+    return os.getenv("TOX_PARALLEL_ENV")
+
+
+@pytest.fixture(scope="session")
+def django_db_modify_db_settings_xdist_suffix(request):
+    skip_if_no_django()
+
+    return getattr(request.config, "slaveinput", {}).get("slaveid")
+
+
+@pytest.fixture(scope="session")
+def django_db_modify_db_settings_suffix(
+    django_db_modify_db_settings_tox_suffix,
+    django_db_modify_db_settings_xdist_suffix
+):
+    skip_if_no_django()
+    xdist_worker = django_db_modify_db_settings_xdist_suffix
+    tox_environment = django_db_modify_db_settings_tox_suffix
     suffix_parts = []
     if tox_environment:
         # Put a suffix like _py27-django21 on tox workers

pytest_django/plugin.py

@@ -25,6 +25,7 @@
 from .fixtures import django_db_modify_db_settings_parallel_suffix  # noqa
 from .fixtures import django_db_modify_db_settings_tox_suffix  # noqa
 from .fixtures import django_db_modify_db_settings_xdist_suffix  # noqa
+from .fixtures import django_db_modify_db_settings_suffix # noqa
 from .fixtures import _live_server_helper  # noqa
 from .fixtures import admin_client  # noqa
 from .fixtures import admin_user  # noqa