Merged regressiontests and modeltests into the test root.

tests/update/models.py

@@ -0,0 +1,40 @@
+"""
+Tests for the update() queryset method that allows in-place, multi-object
+updates.
+"""
+
+from django.db import models
+from django.utils import six
+from django.utils.encoding import python_2_unicode_compatible
+
+
+@python_2_unicode_compatible
+class DataPoint(models.Model):
+    name = models.CharField(max_length=20)
+    value = models.CharField(max_length=20)
+    another_value = models.CharField(max_length=20, blank=True)
+
+    def __str__(self):
+        return six.text_type(self.name)
+
+@python_2_unicode_compatible
+class RelatedPoint(models.Model):
+    name = models.CharField(max_length=20)
+    data = models.ForeignKey(DataPoint)
+
+    def __str__(self):
+        return six.text_type(self.name)
+
+
+class A(models.Model):
+    x = models.IntegerField(default=10)
+
+class B(models.Model):
+    a = models.ForeignKey(A)
+    y = models.IntegerField(default=10)
+
+class C(models.Model):
+    y = models.IntegerField(default=10)
+
+class D(C):
+    a = models.ForeignKey(A)