diff options
author | Tim Graham <timograham@gmail.com> | 2016-04-22 12:59:41 -0400 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2016-04-22 12:59:41 -0400 |
commit | 87338198e921d944cc241e59c827bb9dffef728b (patch) | |
tree | 2b5abfd97e35159c20ad16b9ca38b106f885ac63 /tests/model_inheritance_regress | |
parent | 9e4e20a71c9648f8a1c6397ada40739d4aaa3ec6 (diff) | |
download | django-87338198e921d944cc241e59c827bb9dffef728b.tar.gz |
Fixed #26320 -- Deprecated implicit OneToOnField parent_link.
Diffstat (limited to 'tests/model_inheritance_regress')
-rw-r--r-- | tests/model_inheritance_regress/models.py | 6 | ||||
-rw-r--r-- | tests/model_inheritance_regress/tests.py | 20 |
2 files changed, 5 insertions, 21 deletions
diff --git a/tests/model_inheritance_regress/models.py b/tests/model_inheritance_regress/models.py index ad905db981..b5bc75061d 100644 --- a/tests/model_inheritance_regress/models.py +++ b/tests/model_inheritance_regress/models.py @@ -45,12 +45,6 @@ class ParkingLot(Place): return "%s the parking lot" % self.name -class ParkingLot2(Place): - # In lieu of any other connector, an existing OneToOneField will be - # promoted to the primary key. - parent = models.OneToOneField(Place, models.CASCADE) - - class ParkingLot3(Place): # The parent_link connector need not be the pk on the model. primary_key = models.AutoField(primary_key=True) diff --git a/tests/model_inheritance_regress/tests.py b/tests/model_inheritance_regress/tests.py index f7044144ec..7499e4e42f 100644 --- a/tests/model_inheritance_regress/tests.py +++ b/tests/model_inheritance_regress/tests.py @@ -13,10 +13,9 @@ from django.test import TestCase from .models import ( ArticleWithAuthor, BachelorParty, BirthdayParty, BusStation, Child, DerivedM, InternalCertificationAudit, ItalianRestaurant, M2MChild, - MessyBachelorParty, ParkingLot, ParkingLot2, ParkingLot3, ParkingLot4A, - ParkingLot4B, Person, Place, Profile, QualityControl, Restaurant, - SelfRefChild, SelfRefParent, Senator, Supplier, TrainStation, User, - Wholesaler, + MessyBachelorParty, ParkingLot, ParkingLot3, ParkingLot4A, ParkingLot4B, + Person, Place, Profile, QualityControl, Restaurant, SelfRefChild, + SelfRefParent, Senator, Supplier, TrainStation, User, Wholesaler, ) @@ -293,20 +292,11 @@ class ModelInheritanceTest(TestCase): def test_use_explicit_o2o_to_parent_as_pk(self): """ - Regression tests for #10406 - If there's a one-to-one link between a child model and the parent and - no explicit pk declared, we can use the one-to-one link as the pk on - the child. + The connector from child to parent need not be the pk on the child. """ - self.assertEqual(ParkingLot2._meta.pk.name, "parent") - - # However, the connector from child to parent need not be the pk on - # the child at all. self.assertEqual(ParkingLot3._meta.pk.name, "primary_key") # the child->parent link - self.assertEqual( - ParkingLot3._meta.get_ancestor_link(Place).name, - "parent") + self.assertEqual(ParkingLot3._meta.get_ancestor_link(Place).name, "parent") def test_use_explicit_o2o_to_parent_from_abstract_model(self): self.assertEqual(ParkingLot4A._meta.pk.name, "parent") |