[pull] main from django:main

tests/model_inheritance/tests.py

@@ -449,6 +449,12 @@ def test_inherited_multiple_objects_returned_exception(self):
         with self.assertRaises(Place.MultipleObjectsReturned):
             Restaurant.objects.get()
 
+    def test_inherited_not_updated_exception(self):
+        # NotUpdated is also inherited.
+        obj = Restaurant(id=999)
+        with self.assertRaises(Place.NotUpdated):
+            obj.save(update_fields={"name"})
+
     def test_related_objects_for_inherited_models(self):
         # Related objects work just as they normally do.
         s1 = Supplier.objects.create(name="Joe's Chickens", address="123 Sesame St")

tests/proxy_models/tests.py

@@ -2,7 +2,7 @@
 from django.contrib.auth.models import User as AuthUser
 from django.contrib.contenttypes.models import ContentType
 from django.core import checks, management
-from django.db import DEFAULT_DB_ALIAS, models
+from django.db import DEFAULT_DB_ALIAS, models, transaction
 from django.db.models import signals
 from django.test import TestCase, override_settings
 from django.test.utils import isolate_apps
@@ -104,8 +104,8 @@ def test_correct_type_proxy_of_proxy(self):
 
     def test_proxy_included_in_ancestors(self):
         """
-        Proxy models are included in the ancestors for a model's DoesNotExist
-        and MultipleObjectsReturned
+        Proxy models are included in the ancestors for a model's DoesNotExist,
+        MultipleObjectsReturned, and NotUpdated
         """
         Person.objects.create(name="Foo McBar")
         MyPerson.objects.create(name="Bazza del Frob")
@@ -118,6 +118,8 @@ def test_proxy_included_in_ancestors(self):
             MyPersonProxy.objects.get(id__lt=max_id + 1)
         with self.assertRaises(Person.DoesNotExist):
             StatusPerson.objects.get(name="Zathras")
+        with self.assertRaises(Person.NotUpdated), transaction.atomic():
+            StatusPerson(id=999).save(update_fields={"name"})
 
         StatusPerson.objects.create(name="Bazza Jr.")
         StatusPerson.objects.create(name="Foo Jr.")

tests/queryset_pickle/tests.py

@@ -70,6 +70,10 @@ def test_multipleobjectsreturned_class(self):
         klass = Event.MultipleObjectsReturned
         self.assertIs(pickle.loads(pickle.dumps(klass)), klass)
 
+    def test_not_updated_class(self):
+        klass = Event.NotUpdated
+        self.assertIs(pickle.loads(pickle.dumps(klass)), klass)
+
     def test_forward_relatedobjectdoesnotexist_class(self):
         # ForwardManyToOneDescriptor
         klass = Event.group.RelatedObjectDoesNotExist