summaryrefslogtreecommitdiff
path: root/django/contrib/contenttypes/tests.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/contrib/contenttypes/tests.py')
-rw-r--r--django/contrib/contenttypes/tests.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/django/contrib/contenttypes/tests.py b/django/contrib/contenttypes/tests.py
index 7937873a00..f300294cd6 100644
--- a/django/contrib/contenttypes/tests.py
+++ b/django/contrib/contenttypes/tests.py
@@ -274,3 +274,10 @@ class ContentTypesTests(TestCase):
model = 'OldModel',
)
self.assertEqual(six.text_type(ct), 'Old model')
+ self.assertIsNone(ct.model_class())
+
+ # Make sure stale ContentTypes can be fetched like any other object.
+ # Before Django 1.6 this caused a NoneType error in the caching mechanism.
+ # Instead, just return the ContentType object and let the app detect stale states.
+ ct_fetched = ContentType.objects.get_for_id(ct.pk)
+ self.assertIsNone(ct_fetched.model_class())