From b60375d4bbb848af7950379e2f35a1a65f7a2591 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 16 Jul 2015 08:00:29 -0400 Subject: Fixed #25129 -- Made model instance defaults work with migrations (refs #24919). --- tests/delete/models.py | 2 +- tests/delete/tests.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/delete') diff --git a/tests/delete/models.py b/tests/delete/models.py index 38e7c7cf0e..3255c68c64 100644 --- a/tests/delete/models.py +++ b/tests/delete/models.py @@ -13,7 +13,7 @@ class R(models.Model): def get_default_r(): - return R.objects.get_or_create(is_default=True)[0] + return R.objects.get_or_create(is_default=True)[0].pk class S(models.Model): diff --git a/tests/delete/tests.py b/tests/delete/tests.py index 11e780bfac..60c61ed281 100644 --- a/tests/delete/tests.py +++ b/tests/delete/tests.py @@ -31,7 +31,7 @@ class OnDeleteTests(TestCase): a = create_a('setvalue') a.setvalue.delete() a = A.objects.get(pk=a.pk) - self.assertEqual(self.DEFAULT, a.setvalue) + self.assertEqual(self.DEFAULT, a.setvalue.pk) def test_setnull(self): a = create_a('setnull') @@ -43,7 +43,7 @@ class OnDeleteTests(TestCase): a = create_a('setdefault') a.setdefault.delete() a = A.objects.get(pk=a.pk) - self.assertEqual(self.DEFAULT, a.setdefault) + self.assertEqual(self.DEFAULT, a.setdefault.pk) def test_setdefault_none(self): a = create_a('setdefault_none') -- cgit v1.3