From 130e7ab617d746291629de6a5a1fbb5ea9cd3fe5 Mon Sep 17 00:00:00 2001 From: Julien Phalip Date: Sat, 11 Feb 2012 09:55:54 +0000 Subject: Fixed #17256 -- Ensured that content types get cached when retrieved by natural key. Thanks, defaultwombat and charettes. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17502 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/comment_tests/tests/templatetag_tests.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/regressiontests/comment_tests/tests/templatetag_tests.py b/tests/regressiontests/comment_tests/tests/templatetag_tests.py index de397678cd..0b036ce921 100644 --- a/tests/regressiontests/comment_tests/tests/templatetag_tests.py +++ b/tests/regressiontests/comment_tests/tests/templatetag_tests.py @@ -130,8 +130,7 @@ class CommentTemplateTagTests(CommentTestCase): with self.assertNumQueries(4): self.testRenderCommentListFromObject() - # Force the CT to be cached - ct = ContentType.objects.get_for_model(Article) + # CT's should be cached with self.assertNumQueries(3): self.testRenderCommentListFromObject() @@ -141,7 +140,6 @@ class CommentTemplateTagTests(CommentTestCase): with self.assertNumQueries(4): self.verifyGetCommentList() - ct = ContentType.objects.get_for_model(Author) with self.assertNumQueries(3): self.verifyGetCommentList() @@ -151,7 +149,6 @@ class CommentTemplateTagTests(CommentTestCase): with self.assertNumQueries(3): self.testRenderCommentForm() - ct = ContentType.objects.get_for_model(Article) with self.assertNumQueries(2): self.testRenderCommentForm() @@ -161,7 +158,6 @@ class CommentTemplateTagTests(CommentTestCase): with self.assertNumQueries(3): self.testGetCommentForm() - ct = ContentType.objects.get_for_model(Article) with self.assertNumQueries(2): self.testGetCommentForm() @@ -171,6 +167,5 @@ class CommentTemplateTagTests(CommentTestCase): with self.assertNumQueries(3): self.verifyGetCommentCount() - ct = ContentType.objects.get_for_model(Article) with self.assertNumQueries(2): self.verifyGetCommentCount() -- cgit v1.3