summaryrefslogtreecommitdiff
path: root/tests/test_utils
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-05-08 09:53:49 +0200
committerClaude Paroz <claude@2xlibre.net>2017-05-20 15:11:09 +0200
commit43c65e0eb003b0eed34eae60a9e2292c00d7e4b6 (patch)
tree263ae9031baf38dbe1ce6522efcb9b4f21421837 /tests/test_utils
parenteb66057c1e7704bc48992ffe35c27554919551c8 (diff)
Fixed #28180 -- Numbered queries in assertNumQueries failure output
Thanks Tim Graham for the test part.
Diffstat (limited to 'tests/test_utils')
-rw-r--r--tests/test_utils/tests.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py
index 69a6a72196..06e2ce417c 100644
--- a/tests/test_utils/tests.py
+++ b/tests/test_utils/tests.py
@@ -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):