Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.2.X] Tweaked some asserts not present in older unittest or depreca…

…ted from tests added in r15499. Refs #13987

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 7cfb2b6335de1092b3dbe703ccc735488fefa7ea 1 parent af03867
@ramiro ramiro authored
Showing with 4 additions and 4 deletions.
  1. +4 −4 tests/regressiontests/model_inheritance_regress/tests.py
View
8 tests/regressiontests/model_inheritance_regress/tests.py
@@ -394,15 +394,15 @@ def test_concrete_abstract_concrete_pk(self):
# Regression test for #13987: Primary key is incorrectly determined
# when more than one model has a concrete->abstract->concrete
# inheritance hierarchy.
- self.assertEquals(
+ self.assertEqual(
len([field for field in BusStation._meta.local_fields
if field.primary_key]),
1
)
- self.assertEquals(
+ self.assertEqual(
len([field for field in TrainStation._meta.local_fields
if field.primary_key]),
1
)
- self.assertIs(BusStation._meta.pk.model, BusStation)
- self.assertIs(TrainStation._meta.pk.model, TrainStation)
+ self.assertTrue(BusStation._meta.pk.model is BusStation)
+ self.assertTrue(TrainStation._meta.pk.model is TrainStation)
Please sign in to comment.
Something went wrong with that request. Please try again.