Switch several assertNumQueries to use the context manager, which is much more beautiful. (69e1e618) · Commits · Dom Sekotill / django

tests/modeltests/select_related/tests.py

+12 −20

Original line number	Diff line number	Diff line
		from __future__ import absolute_import
		from __future__ import with_statement, absolute_import

		from django.test import TestCase

		from .models import Domain, Kingdom, Phylum, Klass, Order, Family, Genus, Species


		class SelectRelatedTests(TestCase):

		def create_tree(self, stringtree):
		@@ -41,29 +42,27 @@ class SelectRelatedTests(TestCase):
		"""
		Normally, accessing FKs doesn't fill in related objects
		"""
		def test():
		with self.assertNumQueries(8):
		fly = Species.objects.get(name="melanogaster")
		domain = fly.genus.family.order.klass.phylum.kingdom.domain
		self.assertEqual(domain.name, 'Eukaryota')
		self.assertNumQueries(8, test)

		def test_access_fks_with_select_related(self):
		"""
		A select_related() call will fill in those related objects without any
		extra queries
		"""
		def test():
		with self.assertNumQueries(1):
		person = Species.objects.select_related(depth=10).get(name="sapiens")
		domain = person.genus.family.order.klass.phylum.kingdom.domain
		self.assertEqual(domain.name, 'Eukaryota')
		self.assertNumQueries(1, test)

		def test_list_without_select_related(self):
		"""
		select_related() also of course applies to entire lists, not just
		items. This test verifies the expected behavior without select_related.
		"""
		def test():
		with self.assertNumQueries(9):
		world = Species.objects.all()
		families = [o.genus.family.name for o in world]
		self.assertEqual(sorted(families), [
		@@ -72,14 +71,13 @@ class SelectRelatedTests(TestCase):
		'Fabaceae',
		'Hominidae',
		])
		self.assertNumQueries(9, test)

		def test_list_with_select_related(self):
		"""
		select_related() also of course applies to entire lists, not just
		items. This test verifies the expected behavior with select_related.
		"""
		def test():
		with self.assertNumQueries(1):
		world = Species.objects.all().select_related()
		families = [o.genus.family.name for o in world]
		self.assertEqual(sorted(families), [
		@@ -88,21 +86,19 @@ class SelectRelatedTests(TestCase):
		'Fabaceae',
		'Hominidae',
		])
		self.assertNumQueries(1, test)

		def test_depth(self, depth=1, expected=7):
		"""
		The "depth" argument to select_related() will stop the descent at a
		particular level.
		"""
		def test():
		# Notice: one fewer queries than above because of depth=1
		with self.assertNumQueries(expected):
		pea = Species.objects.select_related(depth=depth).get(name="sativum")
		self.assertEqual(
		pea.genus.family.order.klass.phylum.kingdom.domain.name,
		'Eukaryota'
		)
		# Notice: one fewer queries than above because of depth=1
		self.assertNumQueries(expected, test)

		def test_larger_depth(self):
		"""
		@@ -116,12 +112,11 @@ class SelectRelatedTests(TestCase):
		The "depth" argument to select_related() will stop the descent at a
		particular level. This can be used on lists as well.
		"""
		def test():
		with self.assertNumQueries(5):
		world = Species.objects.all().select_related(depth=2)
		orders = [o.genus.family.order.name for o in world]
		self.assertEqual(sorted(orders),
		['Agaricales', 'Diptera', 'Fabales', 'Primates'])
		self.assertNumQueries(5, test)

		def test_select_related_with_extra(self):
		s = Species.objects.all().select_related(depth=1)\
		@@ -137,31 +132,28 @@ class SelectRelatedTests(TestCase):
		In this case, we explicitly say to select the 'genus' and
		'genus.family' models, leading to the same number of queries as before.
		"""
		def test():
		with self.assertNumQueries(1):
		world = Species.objects.select_related('genus__family')
		families = [o.genus.family.name for o in world]
		self.assertEqual(sorted(families),
		['Amanitacae', 'Drosophilidae', 'Fabaceae', 'Hominidae'])
		self.assertNumQueries(1, test)

		def test_more_certain_fields(self):
		"""
		In this case, we explicitly say to select the 'genus' and
		'genus.family' models, leading to the same number of queries as before.
		"""
		def test():
		with self.assertNumQueries(2):
		world = Species.objects.filter(genus__name='Amanita')\
		.select_related('genus__family')
		orders = [o.genus.family.order.name for o in world]
		self.assertEqual(orders, [u'Agaricales'])
		self.assertNumQueries(2, test)

		def test_field_traversal(self):
		def test():
		with self.assertNumQueries(1):
		s = Species.objects.all().select_related('genus__family__order'
		).order_by('id')[0:1].get().genus.family.order.name
		self.assertEqual(s, u'Diptera')
		self.assertNumQueries(1, test)

		def test_depth_fields_fails(self):
		self.assertRaises(TypeError,

tests/modeltests/validation/test_unique.py

+3 −6

Original line number	Diff line number	Diff line
		@@ -58,26 +58,23 @@ class GetUniqueCheckTests(unittest.TestCase):
		class PerformUniqueChecksTest(TestCase):
		def test_primary_key_unique_check_not_performed_when_adding_and_pk_not_specified(self):
		# Regression test for #12560
		def test():
		with self.assertNumQueries(0):
		mtv = ModelToValidate(number=10, name='Some Name')
		setattr(mtv, '_adding', True)
		mtv.full_clean()
		self.assertNumQueries(0, test)

		def test_primary_key_unique_check_performed_when_adding_and_pk_specified(self):
		# Regression test for #12560
		def test():
		with self.assertNumQueries(1):
		mtv = ModelToValidate(number=10, name='Some Name', id=123)
		setattr(mtv, '_adding', True)
		mtv.full_clean()
		self.assertNumQueries(1, test)

		def test_primary_key_unique_check_not_performed_when_not_adding(self):
		# Regression test for #12132
		def test():
		with self.assertNumQueries(0):
		mtv = ModelToValidate(number=10, name='Some Name')
		mtv.full_clean()
		self.assertNumQueries(0, test)

		def test_unique_for_date(self):
		p1 = Post.objects.create(title="Django 1.0 is released",

tests/regressiontests/comment_tests/tests/templatetag_tests.py

+1 −2

Original line number	Diff line number	Diff line
		@@ -45,9 +45,8 @@ class CommentTemplateTagTests(CommentTestCase):
		self.testRenderCommentForm("{% render_comment_form for a %}")

		def testRenderCommentFormFromObjectWithQueryCount(self):
		def test():
		with self.assertNumQueries(1):
		self.testRenderCommentFormFromObject()
		self.assertNumQueries(1, test)

		def verifyGetCommentCount(self, tag=None):
		t = "{% load comments %}" + (tag or "{% get_comment_count for comment_tests.article a.id as cc %}") + "{{ cc }}"

tests/regressiontests/defer_regress/tests.py

+5 −9

Original line number	Diff line number	Diff line
		from __future__ import absolute_import
		from __future__ import with_statement, absolute_import

		from operator import attrgetter

		@@ -21,22 +21,18 @@ class DeferRegressionTest(TestCase):
		obj = Item.objects.only("name", "other_value").get(name="first")
		# Accessing "name" doesn't trigger a new database query. Accessing
		# "value" or "text" should.
		def test():
		with self.assertNumQueries(0):
		self.assertEqual(obj.name, "first")
		self.assertEqual(obj.other_value, 0)
		self.assertNumQueries(0, test)

		def test():
		with self.assertNumQueries(1):
		self.assertEqual(obj.value, 42)
		self.assertNumQueries(1, test)

		def test():
		with self.assertNumQueries(1):
		self.assertEqual(obj.text, "xyzzy")
		self.assertNumQueries(1, test)

		def test():
		with self.assertNumQueries(0):
		self.assertEqual(obj.text, "xyzzy")
		self.assertNumQueries(0, test)

		# Regression test for #10695. Make sure different instances don't
		# inadvertently share data in the deferred descriptor objects.

tests/regressiontests/forms/tests/models.py

+3 −4

Original line number	Diff line number	Diff line
		# -- coding: utf-8 --
		from __future__ import absolute_import
		from __future__ import with_statement, absolute_import

		import datetime

		@@ -28,11 +28,10 @@ class TestTicket12510(TestCase):
		self.groups = [Group.objects.create(name=name) for name in 'abc']

		def test_choices_not_fetched_when_not_rendering(self):
		def test():
		# only one query is required to pull the model from DB
		with self.assertNumQueries(1):
		field = ModelChoiceField(Group.objects.order_by('-name'))
		self.assertEqual('a', field.clean(self.groups[0].pk).name)
		# only one query is required to pull the model from DB
		self.assertNumQueries(1, test)

		class ModelFormCallableModelDefault(TestCase):
		def test_no_empty_option(self):