Test work

Author: kingbuzzman

pytest_django/fixtures.py

@@ -458,7 +458,9 @@ def async_client() -> django.test.AsyncClient:
 
 
 @pytest.fixture
-def django_user_model() -> type[django.contrib.auth.models.User]:
+def django_user_model(
+    # db: None
+) -> type[django.contrib.auth.models.User]:
     """The class of Django's user model."""
     from django.contrib.auth import get_user_model
 
@@ -474,6 +476,7 @@ def django_username_field(django_user_model: type[django.contrib.auth.models.Use
 
 @pytest.fixture
 def admin_user(
+    # db: None,
     django_user_model: type[django.contrib.auth.models.User],
     django_username_field: str,
 ) -> django.contrib.auth.models.User:
@@ -504,6 +507,7 @@ def admin_user(
 
 @pytest.fixture
 def admin_client(
+    # db: None,
     admin_user: django.contrib.auth.models.User,
 ) -> django.test.Client:
     """A Django test client logged in as an admin user."""

tests/test_fixtures.py

@@ -59,7 +59,7 @@ def test_admin_client(admin_client: Client) -> None:
     assert force_str(resp.content) == "You are an admin"
 
 
-def test_admin_client_no_db_marker(admin_client: Client) -> None:
+def test_admin_client_no_db_marker(db: None, admin_client: Client) -> None:
     assert isinstance(admin_client, Client)
     resp = admin_client.get("/admin-required/")
     assert force_str(resp.content) == "You are an admin"
@@ -71,6 +71,7 @@ def existing_admin_user(django_user_model: type[User]) -> User:
     return django_user_model._default_manager.create_superuser("admin", None, None)
 
 
+@pytest.mark.django_db
 @pytest.mark.usefixtures("existing_admin_user", "admin_user")
 def test_admin_client_existing_user(
     admin_client: Client,
@@ -84,7 +85,7 @@ def test_admin_user(admin_user, django_user_model) -> None:
     assert isinstance(admin_user, django_user_model)
 
 
-def test_admin_user_no_db_marker(admin_user, django_user_model) -> None:
+def test_admin_user_no_db_marker(db: None, admin_user, django_user_model) -> None:
     assert isinstance(admin_user, django_user_model)
 
 
@@ -676,9 +677,11 @@ def admin_required_view(request):
     )
     django_pytester.makepyfile(
         """
+        import pytest
         from django.utils.encoding import force_str
         from tpkg.app.models import MyCustomUser
 
+        @pytest.mark.django_db
         def test_custom_user_model(admin_client):
             resp = admin_client.get('/admin-required/')
             assert force_str(resp.content) == 'You are an admin'

tests/test_without_django_loaded.py

@@ -51,12 +51,16 @@ def test_transactional_db(transactional_db):
     r.stdout.fnmatch_lines(["*4 skipped*"])
 
 
+# @pytest.mark.django_db
 def test_client(pytester: pytest.Pytester) -> None:
     pytester.makepyfile(
         """
+        import pytest
+
         def test_client(client):
             assert 0
 
+        @pytest.mark.django_db
         def test_admin_client(admin_client):
             assert 0
     """