Fix report of the number of queries executed by fixtures

Author: renanivo

pytest_django/plugin.py

@@ -334,19 +334,26 @@ def pytest_fixture_setup(fixturedef, request):
     from django.test.utils import CaptureQueriesContext
     from django.db import connection
 
-    with CaptureQueriesContext(connection) as context:
-        yield
+    _blocking_manager.unblock()
 
-    querycount = len(context.captured_queries)
+    try:
+        with CaptureQueriesContext(connection) as context:
+            yield
+    except Exception:
+        yield
+    else:
+        querycount = len(context.captured_queries)
 
-    if querycount:
-        capman = config.pluginmanager.getplugin('capturemanager')
-        capman.suspendcapture()
+        if querycount:
+            capman = config.pluginmanager.getplugin('capturemanager')
+            capman.suspend_global_capture()
 
-        tw = config.get_terminal_writer()
-        tw.write(' (# queries executed: {})'.format(querycount))
+            tw = config.get_terminal_writer()
+            tw.write(' (# of queries executed: {})'.format(querycount))
 
-        capman.resumecapture()
+            capman.resume_global_capture()
+    finally:
+        _blocking_manager.restore()
 
 
 @pytest.hookimpl(hookwrapper=True)

tests/test_report.py

@@ -109,4 +109,4 @@ def test_without_queries(one_query):
             '--querycount=5'
         )
 
-        assert '(# queries executed: 1)' in result.stdout.str()
+        assert '(# of queries executed: 1)' in result.stdout.str()