Add support for pytest 5.4

Author: davidfritzsche

pytest.ini

@@ -10,3 +10,7 @@ addopts =
 doctest_optionflags = NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL ELLIPSIS
 log_level = DEBUG
 junit_family = xunit2
+
+# By default report warnings as errors
+filterwarnings =
+    error

requirements.in

@@ -12,7 +12,8 @@ mypy==0.770
 pip-tools
 pip>=19.3
 pytest-cov
-pytest~=5.3.5
+pytest-html
+pytest~=5.4.1
 setuptools>=43
 tox-pyenv
 tox>=3.14.3

requirements.txt

@@ -43,7 +43,9 @@ pycodestyle==2.5.0        # via flake8
 pyflakes==2.1.1           # via flake8
 pyparsing==2.4.6          # via packaging
 pytest-cov==2.8.1         # via -r requirements.in
-pytest==5.3.5             # via -r requirements.in, pytest-cov
+pytest-html==2.1.1        # via -r requirements.in
+pytest-metadata==1.8.0    # via pytest-html
+pytest==5.4.1             # via -r requirements.in, pytest-cov, pytest-html, pytest-metadata
 python-debian==0.1.36     # via reuse
 pytoml==0.1.21            # via dflit, dflit-core
 regex==2020.2.20          # via black

src/pytest_mypy_testing/plugin.py

@@ -16,6 +16,10 @@
 from .parser import MypyTestItem, parse_file
 
 
+PYTEST_VERSION = pytest.__version__
+PYTEST_VERISON_INFO = tuple(int(part) for part in PYTEST_VERSION.split("."))
+
+
 class MypyResult(NamedTuple):
     mypy_args: List[str]
     returncode: int
@@ -36,15 +40,27 @@ def __init__(
         self,
         name: str,
         parent: "PytestMypyFile",
-        config: Config,
+        *,
         mypy_item: MypyTestItem,
+        config: Optional[Config] = None,
     ) -> None:
-        super().__init__(name, parent, config)
+        if config is None:
+            config = parent.config
+        super().__init__(name, parent=parent, config=config)
         self.add_marker("mypy")
         self.mypy_item = mypy_item
         for mark in self.mypy_item.marks:
             self.add_marker(mark)
 
+    @classmethod
+    def from_parent(cls, parent, name, mypy_item):
+        if PYTEST_VERISON_INFO < (5, 4):
+            return cls(
+                parent=parent, name=name, config=parent.config, mypy_item=mypy_item
+            )
+        else:
+            return super().from_parent(parent=parent, name=name, mypy_item=mypy_item)
+
     def runtest(self) -> None:
         returncode, actual_messages = self.parent.run_mypy(self.mypy_item)
 
@@ -59,44 +75,55 @@ def reportinfo(self) -> Tuple[str, Optional[int], str]:
         return self.parent.fspath, self.mypy_item.lineno, self.name
 
     def repr_failure(self, excinfo, style=None):
-        if excinfo.errisinstance(MypyAssertionError):
-            exception_repr = excinfo.getrepr(style="short")
-            exception_repr.reprcrash.message = ""
-            exception_repr.reprtraceback.reprentries = [
-                ReprEntry(
-                    filelocrepr=ReprFileLocation(
+        if not excinfo.errisinstance(MypyAssertionError):
+            return super().repr_failure(excinfo, style=style)  # pragma: no cover
+        reprfileloc_key = (
+            "filelocrepr" if PYTEST_VERISON_INFO < (5, 4) else "reprfileloc"
+        )
+        exception_repr = excinfo.getrepr(style="short")
+        exception_repr.reprcrash.message = ""
+        exception_repr.reprtraceback.reprentries = [
+            ReprEntry(
+                lines=mismatch.lines,
+                style="short",
+                reprlocals=None,
+                reprfuncargs=None,
+                **{
+                    reprfileloc_key: ReprFileLocation(
                         path=self.parent.fspath,
                         lineno=mismatch.lineno,
                         message=mismatch.error_message,
-                    ),
-                    lines=mismatch.lines,
-                    style="short",
-                    reprlocals=None,
-                    reprfuncargs=None,
-                )
-                for mismatch in excinfo.value.errors
-            ]
-            return exception_repr
-        else:
-            return super().repr_failure(excinfo, style=style)  # pragma: no cover
+                    )
+                },
+            )
+            for mismatch in excinfo.value.errors
+        ]
+        return exception_repr
 
 
 class PytestMypyFile(pytest.File):
     def __init__(
         self, fspath: LocalPath, parent=None, config=None, session=None, nodeid=None,
     ) -> None:
+        if config is None:
+            config = getattr(parent, "config", None)
         super().__init__(fspath, parent, config, session, nodeid)
         self.add_marker("mypy")
         self.mypy_file = parse_file(self.fspath)
         self._mypy_result: Optional[MypyResult] = None
 
+    @classmethod
+    def from_parent(cls, parent, fspath):
+        if PYTEST_VERISON_INFO < (5, 4):
+            config = getattr(parent, "config", None)
+            return cls(parent=parent, config=config, fspath=fspath)
+        else:
+            return super().from_parent(parent=parent, fspath=fspath)
+
     def collect(self) -> Iterator[PytestMypyTestItem]:
         for item in self.mypy_file.items:
-            yield PytestMypyTestItem(
-                name="[mypy]" + item.name,
-                parent=self,
-                config=self.config,
-                mypy_item=item,
+            yield PytestMypyTestItem.from_parent(
+                parent=self, name="[mypy]" + item.name, mypy_item=item,
             )
 
     def run_mypy(self, item: MypyTestItem) -> Tuple[int, List[Message]]:
@@ -163,14 +190,17 @@ def pytest_collect_file(path: LocalPath, parent):
     if not hasattr(builtins, "reveal_type"):
         setattr(builtins, "reveal_type", lambda x: x)
 
-    config = getattr(parent, "config", None)
+    if path.ext not in (".mypy-testing", ".py"):
+        return None  # pragma: no cover
+    if not path.basename.startswith("test_"):
+        return None  # pragma: no cover
 
-    if path.ext in (".mypy-testing", ".py") and path.basename.startswith("test_"):
-        file = PytestMypyFile(path, parent=parent, config=config)
-        if file.mypy_file.items:
-            return file
+    file = PytestMypyFile.from_parent(parent=parent, fspath=path)
+
+    if file.mypy_file.items:
+        return file
     else:
-        return None  # pragma: no cover
+        return None
 
 
 def pytest_configure(config):

tests/test_plugin.py

@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 from types import SimpleNamespace
+from unittest.mock import Mock
 
 import pytest
 from py._path.local import LocalPath
@@ -15,6 +16,8 @@
 )
 from pytest_mypy_testing.strutil import dedent
 
+from _pytest.config import Config
+
 
 ERROR = Severity.ERROR
 NOTE = Severity.NOTE
@@ -30,7 +33,8 @@ def mk_dummy_parent(tmp_path, filename, content=""):
     path = tmp_path / filename
     path.write_text(content)
 
-    config = SimpleNamespace(rootdir=str(tmp_path))
+    config = Mock(spec=Config)
+    config.rootdir = str(tmp_path)
     session = SimpleNamespace(config=config, _initialpaths=[])
     parent = SimpleNamespace(
         config=config,

tox.ini

@@ -3,20 +3,26 @@
 [tox]
 isolated_build = True
 envlist =
-    {py,py36,py37,py38}-pytest53-mypy{0750,0761,0770}
+    {py,py36,py37,py38}-pytest{53,54}-mypy{0750,0761,0770}
     linting
 
 [testenv]
 deps =
     coverage[toml]
     dataclasses;python_version<"3.7"
     pytest53: pytest~=5.3.5
+    pytest54: pytest~=5.4.1
     pytest-cov
+    pytest-html
     mypy0750: mypy==0.750
     mypy0761: mypy==0.761
     mypy0770: mypy==0.770
+setenv =
+    COVERAGE_FILE={toxinidir}/build/{envname}/coverage
 commands =
-    coverage run -m pytest
+    coverage run --context "{envname}" -m pytest \
+      --html={toxinidir}/build/{envname}/pytest-report.html \
+      --junitxml={toxinidir}/build/{envname}/junit.xml
 
 [testenv:linting]
 deps =