_assert_num_queries: yield context

Author: blueyed

docs/helpers.rst

@@ -259,11 +259,13 @@ Example
 ::
 
     def test_queries(django_assert_num_queries):
-        with django_assert_num_queries(3):
+        with django_assert_num_queries(3) as captured:
             Item.objects.create('foo')
             Item.objects.create('bar')
             Item.objects.create('baz')
 
+        assert 'foo' in captured.captured_queries[0]['sql']
+
 
 ``django_assert_max_num_queries``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

pytest_django/fixtures.py

@@ -360,14 +360,16 @@ def _assert_num_queries(config, num, exact=True):
     from django.test.utils import CaptureQueriesContext
     verbose = config.getoption('verbose') > 0
     with CaptureQueriesContext(connection) as context:
-        yield
+        yield context
         num_queries = len(context)
         failed = num != num_queries if exact else num < num_queries
         if failed:
             msg = "Expected to perform {} queries {}{}".format(
                 num,
                 '' if exact else 'or less ',
-                'but {} were done'.format(num_queries)
+                'but {} done'.format(
+                    num_queries == 1 and '1 was' or '%d were' % (num_queries,)
+                )
             )
             if verbose:
                 sqls = (q['sql'] for q in context.captured_queries)

tests/test_fixtures.py

@@ -59,9 +59,13 @@ def test_django_assert_num_queries_db(django_assert_num_queries):
         Item.objects.create(name='bar')
         Item.objects.create(name='baz')
 
-    with pytest.raises(pytest.fail.Exception):
-        with django_assert_num_queries(2):
+    with pytest.raises(pytest.fail.Exception) as excinfo:
+        with django_assert_num_queries(2) as captured:
             Item.objects.create(name='quux')
+    assert excinfo.value.args == (
+        'Expected to perform 2 queries but 1 was done '
+        '(add -v option to show queries)',)
+    assert len(captured.captured_queries) == 1
 
 
 @pytest.mark.django_db
@@ -70,12 +74,18 @@ def test_django_assert_max_num_queries_db(django_assert_max_num_queries):
         Item.objects.create(name='1-foo')
         Item.objects.create(name='2-bar')
 
-    with pytest.raises(pytest.fail.Exception):
-        with django_assert_max_num_queries(2):
+    with pytest.raises(pytest.fail.Exception) as excinfo:
+        with django_assert_max_num_queries(2) as captured:
             Item.objects.create(name='1-foo')
             Item.objects.create(name='2-bar')
             Item.objects.create(name='3-quux')
 
+    assert excinfo.value.args == (
+        'Expected to perform 2 queries or less but 3 were done '
+        '(add -v option to show queries)',)
+    assert len(captured.captured_queries) == 3
+    assert '1-foo' in captured.captured_queries[0]['sql']
+
 
 @pytest.mark.django_db(transaction=True)
 def test_django_assert_num_queries_transactional_db(