Fix disabling/handling of unittest methods with pytest 4.2+ (#700)

Fixes #698.

Author: blueyed

.travis.yml

@@ -24,6 +24,10 @@ jobs:
     - 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
 

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 ################
 
@@ -416,9 +420,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")
@@ -508,16 +512,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)

setup.py

@@ -31,7 +31,7 @@ def read(fname):
     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     setup_requires=['setuptools_scm>=1.11.1'],
     install_requires=[
-        'pytest>=3.6,!=4.2.0',
+        'pytest>=3.6',
         'pathlib2;python_version<"3.4"',
     ],
     extras_require={

tests/test_unittest.py

@@ -1,5 +1,6 @@
 import pytest
 from django.test import TestCase
+from pkg_resources import parse_version
 
 from pytest_django_test.app.models import Item
 
@@ -142,12 +143,19 @@ def test_pass(self):
         )
 
         result = django_testdir.runpytest_subprocess("-v", "-s")
-        result.stdout.fnmatch_lines(
-            [
-                "* ERROR at setup of TestFoo.test_pass *",
+        expected_lines = [
+            "* ERROR at setup of TestFoo.test_pass *",
+        ]
+        if parse_version(pytest.__version__) < parse_version("4.2"):
+            expected_lines += [
                 "E *Failed: <class 'tpkg.test_the_test.TestFoo'>.setUpClass should be a classmethod",  # noqa:E501
             ]
-        )
+        else:
+            expected_lines += [
+                "E * TypeError: *",
+            ]
+
+        result.stdout.fnmatch_lines(expected_lines)
         assert result.ret == 1
 
     def test_setUpClass_multiple_subclasses(self, django_testdir):
@@ -261,7 +269,6 @@ def test_multi_inheritance_setUpClass(self, django_testdir):
         django_testdir.create_test_module(
             """
             from django.test import TestCase
-            from .app.models import Item
 
             # Using a mixin is a regression test, see #280 for more details:
             # https://github.com/pytest-dev/pytest-django/issues/280

tox.ini

@@ -25,6 +25,8 @@ deps =
     postgres: psycopg2-binary
     coverage: coverage-enable-subprocess
 
+    pytest41: pytest>=4.1,<4.2
+
 setenv =
     PYTHONPATH = {toxinidir}:{env:PYTHONPATH:}