mirror of https://github.com/django/django.git
Fixed #28180 -- Numbered queries in assertNumQueries failure output
Thanks Tim Graham for the test part.
This commit is contained in:
parent
eb66057c1e
commit
43c65e0eb0
|
@ -78,7 +78,7 @@ class _AssertNumQueriesContext(CaptureQueriesContext):
|
|||
"%d queries executed, %d expected\nCaptured queries were:\n%s" % (
|
||||
executed, self.num,
|
||||
'\n'.join(
|
||||
query['sql'] for query in self.captured_queries
|
||||
'%d. %s' % (i, query['sql']) for i, query in enumerate(self.captured_queries, start=1)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
|
|
@ -323,8 +323,10 @@ class AssertNumQueriesContextManagerTests(TestCase):
|
|||
with self.assertRaises(AssertionError) as exc_info:
|
||||
with self.assertNumQueries(2):
|
||||
Person.objects.count()
|
||||
self.assertIn("1 queries executed, 2 expected", str(exc_info.exception))
|
||||
self.assertIn("Captured queries were", str(exc_info.exception))
|
||||
exc_lines = str(exc_info.exception).split('\n')
|
||||
self.assertEqual(exc_lines[0], '1 != 2 : 1 queries executed, 2 expected')
|
||||
self.assertEqual(exc_lines[1], 'Captured queries were:')
|
||||
self.assertTrue(exc_lines[2].startswith('1.')) # queries are numbered
|
||||
|
||||
with self.assertRaises(TypeError):
|
||||
with self.assertNumQueries(4000):
|
||||
|
|
Loading…
Reference in New Issue