Do not include the root session with -k
#7046
Conversation
src/_pytest/mark/legacy.py
Outdated
| @@ -46,7 +46,7 @@ def from_item(cls, item: "Item") -> "KeywordMapping": | |||
| import pytest | |||
|
|
|||
| for item in item.listchain(): | |||
| if not isinstance(item, pytest.Instance): | |||
| if item.parent and not isinstance(item, pytest.Instance): | |||
There was a problem hiding this comment.
Is item.parent the canonical way to check for the root node? And are we sure we always want to exclude the root node from keyword matching?
In any case a comment explaining the item.parent condition would be helpful I think since it's not immediately obvious.
There was a problem hiding this comment.
I think the previous fix is better, because it explicitly skips Session in the code. 👍
nicoddemus
added
needs backport
nicoddemus
force-pushed
the
k-skip-session-upstream
branch
from
81dc5d5
to
f5228c4
Compare
testing/test_mark.py
Outdated
| assert_test_is_not_selected("+") | ||
| assert_test_is_not_selected("..") | ||
| # should not match against session | ||
| assert_test_is_not_selected(testdir.tmpdir.basename) |
There was a problem hiding this comment.
Had to remove parametrization because of this one.
|
This one should go in, and it classifies as breaking |
Previously it contained the entire path, which made '-k' match against any name in the full path of the package. Fix pytest-dev#7040
nicoddemus
force-pushed
the
k-skip-session-upstream
branch
from
f5228c4
to
c5b367b
Compare
| @@ -568,8 +568,7 @@ def __init__( | |||
| nodes.FSCollector.__init__( | |||
| self, fspath, parent=parent, config=config, session=session, nodeid=nodeid | |||
| ) | |||
|
|
|||
| self.name = fspath.dirname | |||
| self.name = os.path.basename(str(fspath.dirname)) | |||
There was a problem hiding this comment.
that one looks like a breaking change in isolation, does it bring us in line with other details or is it a new difference?
There was a problem hiding this comment.
crosschecked, it brings us in line
Fixes #7040.