Commit 7cfb2b63 authored by Ramiro Morales's avatar Ramiro Morales
Browse files

[1.2.X] Tweaked some asserts not present in older unittest or deprecated from... 

[1.2.X] Tweaked some asserts not present in older unittest or deprecated 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
parent af03867f

tests/regressiontests/model_inheritance_regress/tests.py

+4 −4
Original line number Diff line number Diff line
@@ -394,15 +394,15 @@ class ModelInheritanceTest(TestCase): 
        # 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)