Split MypyFileItem out of MypyItem

Author: dmtucker

src/pytest_mypy.py

@@ -73,14 +73,14 @@ def pytest_configure_node(self, node):  # xdist hook
 
 
 def pytest_collect_file(path, parent):
-    """Create a MypyItem for every file mypy should run on."""
+    """Create a MypyFileItem for every file mypy should run on."""
     if path.ext == '.py' and any([
             parent.config.option.mypy,
             parent.config.option.mypy_ignore_missing_imports,
     ]):
-        item = MypyItem(path, parent)
+        item = MypyFileItem(path, parent)
         if nodeid_name:
-            item = MypyItem(
+            item = MypyFileItem(
                 path,
                 parent,
                 nodeid='::'.join([item.nodeid, nodeid_name]),
@@ -89,16 +89,30 @@ def pytest_collect_file(path, parent):
     return None
 
 
-class MypyItem(pytest.Item, pytest.File):
+class MypyItem(pytest.Item):
 
-    """A File that Mypy Runs On."""
+    """A Mypy-related test Item."""
 
     MARKER = 'mypy'
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.add_marker(self.MARKER)
 
+    def repr_failure(self, excinfo):
+        """
+        Unwrap mypy errors so we get a clean error message without the
+        full exception repr.
+        """
+        if excinfo.errisinstance(MypyError):
+            return excinfo.value.args[0]
+        return super().repr_failure(excinfo)
+
+
+class MypyFileItem(MypyItem, pytest.File):
+
+    """A File that Mypy Runs On."""
+
     def runtest(self):
         """Raise an exception if mypy found errors for this item."""
         results = _cached_json_results(
@@ -112,7 +126,7 @@ def runtest(self):
                     abspaths=[
                         os.path.abspath(str(item.fspath))
                         for item in self.session.items
-                        if isinstance(item, MypyItem)
+                        if isinstance(item, MypyFileItem)
                     ],
                 )
         )
@@ -129,15 +143,6 @@ def reportinfo(self):
             self.config.invocation_dir.bestrelpath(self.fspath),
         )
 
-    def repr_failure(self, excinfo):
-        """
-        Unwrap mypy errors so we get a clean error message without the
-        full exception repr.
-        """
-        if excinfo.errisinstance(MypyError):
-            return excinfo.value.args[0]
-        return super().repr_failure(excinfo)
-
 
 def _cached_json_results(results_path, results_factory=None):
     """

tests/test_pytest_mypy.py

@@ -98,11 +98,11 @@ def test_non_mypy_error(testdir, xdist_args):
         def pytest_configure(config):
             plugin = config.pluginmanager.getplugin('mypy')
 
-            class PatchedMypyItem(plugin.MypyItem):
+            class PatchedMypyFileItem(plugin.MypyFileItem):
                 def runtest(self):
                     raise Exception('{message}')
 
-            plugin.MypyItem = PatchedMypyItem
+            plugin.MypyFileItem = PatchedMypyFileItem
     '''.format(message=message))
     result = testdir.runpytest_subprocess(*xdist_args)
     result.assert_outcomes()
@@ -178,7 +178,7 @@ def pytest_collection_modifyitems(session, config, items):
             for mypy_item_i in reversed([
                     i
                     for i, item in enumerate(items)
-                    if isinstance(item, plugin.MypyItem)
+                    if isinstance(item, plugin.MypyFileItem)
             ]):
                 items.pop(mypy_item_i)
     ''')