floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6004 from blueyed/fix-nf 

cache: NFPlugin: keep known nodeids
This commit is contained in:
Daniel Hahler 2019-10-23 01:04:48 +02:00 committed by GitHub
parent 14142b9113 3173a26388
commit 82e9013e73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/5206.bugfix.rst Normal file
View File

@ -0,0 +1 @@
Fix ``--nf`` to not forget about known nodeids with partial test selection.

8
src/_pytest/cacheprovider.py
View File

@ -264,8 +264,8 @@ class NFPlugin:
self.cached_nodeids = config.cache.get("cache/nodeids", []) self.cached_nodeids = config.cache.get("cache/nodeids", [])
def pytest_collection_modifyitems(self, session, config, items): def pytest_collection_modifyitems(self, session, config, items):
if self.active:
new_items = OrderedDict() new_items = OrderedDict()
if self.active:
other_items = OrderedDict() other_items = OrderedDict()
for item in items: for item in items:
if item.nodeid not in self.cached_nodeids: if item.nodeid not in self.cached_nodeids:
@ -276,7 +276,11 @@ class NFPlugin:
items[:] = self._get_increasing_order( items[:] = self._get_increasing_order(
new_items.values() new_items.values()
) + self._get_increasing_order(other_items.values()) ) + self._get_increasing_order(other_items.values())
self.cached_nodeids = [x.nodeid for x in items if isinstance(x, pytest.Item)] else:
for item in items:
if item.nodeid not in self.cached_nodeids:
new_items[item.nodeid] = item
self.cached_nodeids.extend(new_items)
def _get_increasing_order(self, items): def _get_increasing_order(self, items):
return sorted(items, key=lambda item: item.fspath.mtime(), reverse=True) return sorted(items, key=lambda item: item.fspath.mtime(), reverse=True)

7
testing/test_cacheprovider.py
View File

@ -982,8 +982,13 @@ class TestNewFirst:
) )
testdir.tmpdir.join("test_1/test_1.py").setmtime(1) testdir.tmpdir.join("test_1/test_1.py").setmtime(1)
result = testdir.runpytest("-v", "--nf") # Running only a subset does not forget about existing ones.
result = testdir.runpytest("-v", "--nf", "test_2/test_2.py")
result.stdout.fnmatch_lines(
["*test_2/test_2.py::test_1[1*", "*test_2/test_2.py::test_1[2*"]
)
result = testdir.runpytest("-v", "--nf")
result.stdout.fnmatch_lines( result.stdout.fnmatch_lines(
[ [
"*test_1/test_1.py::test_1[3*", "*test_1/test_1.py::test_1[3*",