test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #28180 -- Numbered queries in assertNumQueries failure output 

Thanks Tim Graham for the test part.
This commit is contained in:
Claude Paroz 2017-05-08 09:53:49 +02:00
parent eb66057c1e
commit 43c65e0eb0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/test/testcases.py
View File

@ -78,7 +78,7 @@ class _AssertNumQueriesContext(CaptureQueriesContext):
"%d queries executed, %d expected\nCaptured queries were:\n%s" % ( "%d queries executed, %d expected\nCaptured queries were:\n%s" % (
executed, self.num, executed, self.num,
'\n'.join( '\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)
) )
) )
) )

6
tests/test_utils/tests.py
View File

@ -323,8 +323,10 @@ class AssertNumQueriesContextManagerTests(TestCase):
with self.assertRaises(AssertionError) as exc_info: with self.assertRaises(AssertionError) as exc_info:
with self.assertNumQueries(2): with self.assertNumQueries(2):
Person.objects.count() Person.objects.count()
self.assertIn("1 queries executed, 2 expected", str(exc_info.exception)) exc_lines = str(exc_info.exception).split('\n')
self.assertIn("Captured queries were", str(exc_info.exception)) 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.assertRaises(TypeError):
with self.assertNumQueries(4000): with self.assertNumQueries(4000):