Merge pull request #7130 from bluetech/cacheprovider-nf-set

cacheprovider: speed up NFPlugin when --nf is not enabled

Author: bluetech

src/_pytest/cacheprovider.py

@@ -332,13 +332,13 @@ class NFPlugin:
     def __init__(self, config):
         self.config = config
         self.active = config.option.newfirst
-        self.cached_nodeids = config.cache.get("cache/nodeids", [])
+        self.cached_nodeids = set(config.cache.get("cache/nodeids", []))
 
     def pytest_collection_modifyitems(
         self, session: Session, config: Config, items: List[nodes.Item]
     ) -> None:
-        new_items = OrderedDict()  # type: OrderedDict[str, nodes.Item]
         if self.active:
+            new_items = OrderedDict()  # type: OrderedDict[str, nodes.Item]
             other_items = OrderedDict()  # type: OrderedDict[str, nodes.Item]
             for item in items:
                 if item.nodeid not in self.cached_nodeids:
@@ -349,11 +349,9 @@ def pytest_collection_modifyitems(
             items[:] = self._get_increasing_order(
                 new_items.values()
             ) + self._get_increasing_order(other_items.values())
+            self.cached_nodeids.update(new_items)
         else:
-            for item in items:
-                if item.nodeid not in self.cached_nodeids:
-                    new_items[item.nodeid] = item
-        self.cached_nodeids.extend(new_items)
+            self.cached_nodeids.update(item.nodeid for item in items)
 
     def _get_increasing_order(self, items):
         return sorted(items, key=lambda item: item.fspath.mtime(), reverse=True)
@@ -363,7 +361,7 @@ def pytest_sessionfinish(self, session):
         if config.getoption("cacheshow") or hasattr(config, "slaveinput"):
             return
 
-        config.cache.set("cache/nodeids", self.cached_nodeids)
+        config.cache.set("cache/nodeids", sorted(self.cached_nodeids))
 
 
 def pytest_addoption(parser):

testing/test_cacheprovider.py

@@ -74,7 +74,7 @@ def test_cache_failure_warns(self, testdir, monkeypatch):
                     "*/cacheprovider.py:*",
                     "  */cacheprovider.py:*: PytestCacheWarning: could not create cache path "
                     "{}/v/cache/nodeids".format(cache_dir),
-                    '    config.cache.set("cache/nodeids", self.cached_nodeids)',
+                    '    config.cache.set("cache/nodeids", sorted(self.cached_nodeids))',
                     "*1 failed, 3 warnings in*",
                 ]
             )