Merge remote-tracking branch 'upstream/master'

Author: adrysn

.travis.yml

@@ -1,50 +1,64 @@
-sudo: false
 language: python
-dist: trusty
+dist: xenial
 
 jobs:
   fast_finish: true
   include:
     - stage: baseline
       python: 3.6
-      env: TOXENV=py36-dj20-postgres-coverage
+      env: TOXENV=py36-dj20-postgres-xdist-coverage
+      services:
+        - postgresql
     - python: 3.6
       env: TOXENV=py36-dj111-sqlite-coverage
     - python: 2.7
       env: TOXENV=py27-dj111-mysql_innodb-coverage
+      services:
+        - mysql
     - python: 3.6
       env: TOXENV=checkqa,docs
 
     - stage: test
-      # py37 is not available in trusty dist, and requires sudo=true with xenial.
       python: 3.7
       env: TOXENV=py37-dj21-sqlite-coverage
-      dist: xenial
-      sudo: true
+    - python: 3.7
+      env: TOXENV=py37-dj22-sqlite-coverage
+
+    # Explicitly test (older) pytest 4.1.
+    - python: 3.7
+      env: TOXENV=py37-dj21-sqlite-pytest41-coverage
 
     - python: 3.6
       env: TOXENV=py36-djmaster-sqlite-coverage
 
     - python: 3.5
       env: TOXENV=py35-dj110-postgres-coverage
+      services:
+        - postgresql
 
     - python: 3.4
       env: TOXENV=py34-dj19-sqlite_file-coverage
 
     - python: 2.7
       env: TOXENV=py27-dj111-mysql_myisam-coverage
+      services:
+        - mysql
     - python: 2.7
       env: TOXENV=py27-dj18-postgres-coverage
+      services:
+        - postgresql
 
     # pypy/pypy3: not included with coverage reports (much slower then).
-    - python: pypy
+    - python: pypy2.7-6.0
       env: TOXENV=pypy-dj111-sqlite_file
-    - python: pypy3
+    - python: pypy3.5-6.0
       env: TOXENV=pypy3-dj110-sqlite
 
     - stage: test_release
       python: 3.6
       env: TOXENV=py36-dj20-postgres
+      services:
+        - postgresql
 
     - stage: release
       script: skip
@@ -75,7 +89,7 @@ stages:
     if: tag IS present
 
 install:
-  - pip install tox==3.3.0
+  - pip install tox==3.7.0
 
 script:
   - tox

README.rst

@@ -28,7 +28,7 @@ pytest-django allows you to test your Django project/applications with the
   <https://pytest-django.readthedocs.io/en/latest/contributing.html>`_
 * Version compatibility:
 
-  * Django: 1.8-1.11, 2.0-2.1,
+  * Django: 1.8-1.11, 2.0-2.2,
     and latest master branch (compatible at the time of each release)
   * Python: CPython 2.7, 3.4-3.7 or PyPy 2, 3
   * pytest: >=3.6

docs/changelog.rst

@@ -10,6 +10,43 @@ Features
 * Added a new option `--django-debug` to set the DEBUG setting to True prior to
   running tests.
 
+3.4.7 (2019-02-03)
+------------------
+
+Bugfixes
+^^^^^^^^
+
+* Fix disabling/handling of unittest methods with pytest 4.2+ (#700)
+
+3.4.6 (2019-02-01)
+------------------
+
+Bugfixes
+^^^^^^^^
+
+* django_find_project: add cwd as fallback always (#690)
+
+Misc
+^^^^
+
+* Enable tests for Django 2.2 and add classifier (#693)
+* Disallow pytest 4.2.0 in ``install_requires`` (#697)
+
+3.4.5 (2019-01-07)
+------------------
+
+Bugfixes
+^^^^^^^^
+
+* Use ``request.config`` instead of ``pytest.config`` (#677)
+* :fixture:`admin_user`: handle "email" username_field (#676)
+
+Misc
+^^^^
+
+* Minor doc fixes (#674)
+* tests: fix for pytest 4 (#675)
+
 3.4.4 (2018-11-13)
 ------------------
 

docs/helpers.rst

@@ -178,6 +178,8 @@ Example
 Using the `admin_client` fixture will cause the test to automatically be marked for database use (no need to specify the
 ``django_db`` mark).
 
+.. fixture:: admin_user
+
 ``admin_user`` - an admin user (superuser)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -283,17 +285,20 @@ Example
 ``django_assert_num_queries``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. py:function:: django_assert_num_queries(connection=None, info=None)
+.. py:function:: django_assert_num_queries(num, connection=None, info=None)
 
+  :param num: expected number of queries
   :param connection: optional non-default DB connection
   :param str info: optional info message to display on failure
 
 This fixture allows to check for an expected number of DB queries.
 
+If the assertion failed, the executed queries can be shown by using
+the verbose command line option.
+
 It wraps `django.test.utils.CaptureQueriesContext` and yields the wrapped
 CaptureQueriesContext instance.
 
-
 Example usage::
 
     def test_queries(django_assert_num_queries):
@@ -310,8 +315,9 @@ Example usage::
 ``django_assert_max_num_queries``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. py:function:: django_assert_num_queries(connection=None, info=None)
+.. py:function:: django_assert_max_num_queries(num, connection=None, info=None)
 
+  :param num: expected maximum number of queries
   :param connection: optional non-default DB connection
   :param str info: optional info message to display on failure
 
@@ -322,7 +328,7 @@ It is a specialized version of :fixture:`django_assert_num_queries`.
 Example usage::
 
     def test_max_queries(django_assert_max_num_queries):
-        with django_assert_max_num_queries(3):
+        with django_assert_max_num_queries(2):
             Item.objects.create('foo')
             Item.objects.create('bar')
 

pytest_django/fixtures.py

@@ -3,16 +3,14 @@
 from __future__ import with_statement
 
 import os
+import warnings
+from contextlib import contextmanager
 from functools import partial
 
 import pytest
 
-from contextlib import contextmanager
-
 from . import live_server_helper
-
 from .django_compat import is_django_unittest
-
 from .lazy_django import skip_if_no_django
 
 __all__ = [
@@ -105,14 +103,14 @@ def django_db_setup(
 
     with django_db_blocker.unblock():
         db_cfg = setup_databases(
-            verbosity=pytest.config.option.verbose,
+            verbosity=request.config.option.verbose,
             interactive=False,
             **setup_databases_args
         )
 
     def teardown_database():
         with django_db_blocker.unblock():
-            teardown_databases(db_cfg, verbosity=pytest.config.option.verbose)
+            teardown_databases(db_cfg, verbosity=request.config.option.verbose)
 
     if not django_db_keepdb:
         request.addfinalizer(teardown_database)
@@ -254,15 +252,16 @@ def admin_user(db, django_user_model, django_username_field):
     """
     UserModel = django_user_model
     username_field = django_username_field
+    username = "[email protected]" if username_field == "email" else "admin"
 
     try:
-        user = UserModel._default_manager.get(**{username_field: "admin"})
+        user = UserModel._default_manager.get(**{username_field: username})
     except UserModel.DoesNotExist:
         extra_fields = {}
-        if username_field != "username":
+        if username_field not in ("username", "email"):
             extra_fields[username_field] = "admin"
         user = UserModel._default_manager.create_superuser(
-            "admin", "[email protected]", "password", **extra_fields
+            username, "[email protected]", "password", **extra_fields
         )
     return user
 
@@ -362,11 +361,10 @@ def live_server(request):
         if django.VERSION >= (1, 11):
             ports = addr.split(":")[1]
             if "-" in ports or "," in ports:
-                request.config.warn(
-                    "D001",
+                warnings.warn(
                     "Specifying multiple live server ports is not supported "
                     "in Django 1.11. This will be an error in a future "
-                    "pytest-django release.",
+                    "pytest-django release."
                 )
 
     if not addr:

pytest_django/plugin.py

@@ -12,6 +12,7 @@
 import types
 
 import pytest
+from pkg_resources import parse_version
 
 from .django_compat import is_django_unittest  # noqa
 from .fixtures import django_assert_num_queries  # noqa
@@ -49,6 +50,9 @@
 
 PY2 = sys.version_info[0] == 2
 
+# pytest 4.2 handles unittest setup/teardown itself via wrapping fixtures.
+_handle_unittest_methods = parse_version(pytest.__version__) < parse_version("4.2")
+
 
 # ############### pytest hooks ################
 
@@ -185,8 +189,11 @@ def find_django_path(args):
         args = map(str, args)
         args = [arg_to_path(x) for x in args if not x.startswith("-")]
 
+        cwd = pathlib.Path.cwd()
         if not args:
-            args = [pathlib.Path.cwd()]
+            args.append(cwd)
+        elif cwd not in args:
+            args.append(cwd)
 
         for arg in args:
             if is_django_project(arg):
@@ -416,9 +423,9 @@ def _restore_class_methods(cls):
 
 
 def pytest_runtest_setup(item):
-    if django_settings_is_configured() and is_django_unittest(item):
-        cls = item.cls
-        _disable_class_methods(cls)
+    if _handle_unittest_methods:
+        if django_settings_is_configured() and is_django_unittest(item):
+            _disable_class_methods(item.cls)
 
 
 @pytest.fixture(autouse=True, scope="session")
@@ -514,16 +521,19 @@ def _cleaning_debug(self):
 
         cls.debug = _cleaning_debug
 
-        _restore_class_methods(cls)
-        cls.setUpClass()
-        _disable_class_methods(cls)
-
-        def teardown():
+        if _handle_unittest_methods:
             _restore_class_methods(cls)
-            cls.tearDownClass()
-            django_db_blocker.restore()
+            cls.setUpClass()
+            _disable_class_methods(cls)
 
-        request.addfinalizer(teardown)
+            def teardown():
+                _restore_class_methods(cls)
+                cls.tearDownClass()
+                django_db_blocker.restore()
+
+            request.addfinalizer(teardown)
+        else:
+            request.addfinalizer(django_db_blocker.restore)
 
 
 @pytest.fixture(scope="function", autouse=True)

pytest_django_test/app/migrations/0001_initial.py

@@ -9,16 +9,22 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='Item',
+            name="Item",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True,
-                                        serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=100)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=100)),
             ],
-        ),
+        )
     ]

pytest_django_test/app/views.py

@@ -7,9 +7,9 @@
 
 def admin_required_view(request):
     if request.user.is_staff:
-        return HttpResponse(Template('You are an admin').render(Context()))
-    return HttpResponse(Template('Access denied').render(Context()))
+        return HttpResponse(Template("You are an admin").render(Context()))
+    return HttpResponse(Template("Access denied").render(Context()))
 
 
 def item_count(request):
-    return HttpResponse('Item count: %d' % Item.objects.count())
+    return HttpResponse("Item count: %d" % Item.objects.count())

pytest_django_test/compat.py

@@ -7,6 +7,7 @@
 try:
     from django.conf.urls import patterns
 except ImportError:
+
     def patterns(prefix, *urls):
-        assert prefix == ''
+        assert prefix == ""
         return urls