1
0
mirror of https://github.com/django/django.git synced 2025-10-26 07:06:08 +00:00

Switch several assertNumQueries to use the context manager, which is much more beautiful.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor
2011-10-14 17:03:08 +00:00
parent 6c91521902
commit 69e1e6187a
6 changed files with 35 additions and 60 deletions

View File

@@ -1,4 +1,4 @@
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.