tests: fix test_fixtures with -v (#761)

* tests: fix test_fixtures with -v

* Travis: single job with PYTEST_ADDOPTS=-vv

Author: blueyed

.travis.yml

@@ -6,7 +6,10 @@ jobs:
   include:
     - stage: baseline
       python: 3.6
-      env: TOXENV=py36-dj20-postgres-xdist-coverage
+      env:
+        - TOXENV=py36-dj20-postgres-xdist-coverage
+        # Test in verbose mode.
+        - PYTEST_ADDOPTS=-vv
       services:
         - postgresql
     - python: 3.6

tests/test_fixtures.py

@@ -7,12 +7,12 @@
 from __future__ import with_statement
 
 import socket
+from contextlib import contextmanager
 
 import pytest
-
-from django.db import connection, transaction
 from django.conf import settings as real_settings
 from django.core import mail
+from django.db import connection, transaction
 from django.test.client import Client, RequestFactory
 from django.test.testcases import connections_support_transactions
 from django.utils.encoding import force_text
@@ -22,6 +22,18 @@
 from pytest_django_test.compat import HTTPError, urlopen
 
 
+@contextmanager
+def nonverbose_config(config):
+    """Ensure that pytest's config.option.verbose is <= 0."""
+    if config.option.verbose <= 0:
+        yield
+    else:
+        saved = config.option.verbose
+        config.option.verbose = 0
+        yield
+        config.option.verbose = saved
+
+
 def test_client(client):
     assert isinstance(client, Client)
 
@@ -53,56 +65,58 @@ def test_rf(rf):
 
 
 @pytest.mark.django_db
-def test_django_assert_num_queries_db(django_assert_num_queries):
-    with django_assert_num_queries(3):
-        Item.objects.create(name="foo")
-        Item.objects.create(name="bar")
-        Item.objects.create(name="baz")
-
-    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
+def test_django_assert_num_queries_db(request, django_assert_num_queries):
+    with nonverbose_config(request.config):
+        with django_assert_num_queries(3):
+            Item.objects.create(name="foo")
+            Item.objects.create(name="bar")
+            Item.objects.create(name="baz")
 
+        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
-def test_django_assert_max_num_queries_db(django_assert_max_num_queries):
-    with django_assert_max_num_queries(2):
-        Item.objects.create(name="1-foo")
-        Item.objects.create(name="2-bar")
 
-    with pytest.raises(pytest.fail.Exception) as excinfo:
-        with django_assert_max_num_queries(2) as captured:
+@pytest.mark.django_db
+def test_django_assert_max_num_queries_db(request, django_assert_max_num_queries):
+    with nonverbose_config(request.config):
+        with django_assert_max_num_queries(2):
             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"]
+        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(
-    transactional_db, django_assert_num_queries
+    request, transactional_db, django_assert_num_queries
 ):
-    with transaction.atomic():
-
-        with django_assert_num_queries(3):
-            Item.objects.create(name="foo")
-            Item.objects.create(name="bar")
-            Item.objects.create(name="baz")
+    with nonverbose_config(request.config):
+        with transaction.atomic():
+            with django_assert_num_queries(3):
+                Item.objects.create(name="foo")
+                Item.objects.create(name="bar")
+                Item.objects.create(name="baz")
 
-        with pytest.raises(pytest.fail.Exception):
-            with django_assert_num_queries(2):
-                Item.objects.create(name="quux")
+            with pytest.raises(pytest.fail.Exception):
+                with django_assert_num_queries(2):
+                    Item.objects.create(name="quux")
 
 
 def test_django_assert_num_queries_output(django_testdir):