Add --noquerycount parameter to disable --querycount

Author: renanivo

docs/usage.rst

@@ -37,7 +37,7 @@ to display a list of all tests ordered by the number of queries executed.
 
 Using it in conjunction with `--setup-show` will display the number of
 queries executed by each fixture (when the number of queries executed by the
-fixture is greater than zero).
+fixture is greater than zero). Use `--noquerycount` to force the disable of it.
 
 Running tests in parallel with pytest-xdist
 -------------------------------------------

pytest_django/plugin.py

@@ -85,9 +85,14 @@ def pytest_addoption(parser):
                   type='bool', default=False)
 
     group._addoption('--querycount',
-                     action='store', type=int, default=None, metavar='N',
+                     action='store', dest='querycount', type=int,
+                     default=None, metavar='N',
                      help='Show top N tests with most queries '
                           '(N=0 for all).')
+    group._addoption('--noquerycount', '--no-querycount',
+                     action='store_const', dest='querycount',
+                     const=None, default=None,
+                     help='Disable --querycount, when both are used.')
 
 
 def _exists(path, ignore=EnvironmentError):

tests/test_report.py

@@ -19,7 +19,18 @@ def test_zero_queries():
         ''')
 
         result = django_testdir.runpytest_subprocess()
-        assert 'top tests with most queries' not in result.stdout.str()
+        assert 'tests with most queries' not in result.stdout.str()
+
+    def test_disabled_when_noquerycount_is_also_used(self, django_testdir):
+        django_testdir.create_test_module('''
+            def test_zero_queries():
+                pass
+        ''')
+
+        result = django_testdir.runpytest_subprocess(
+            '--querycount=5 --noquerycount'
+        )
+        assert 'tests with most queries' not in result.stdout.str()
 
     def test_querycount_report_lines(self, django_testdir):
         django_testdir.create_test_module('''