Skip to content

fixtures: use node-based matching in get_scope_package when possible #14565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bluetech wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −2
Open

fixtures: use node-based matching in get_scope_package when possible #14565

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/_pytest/fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,13 @@ def get_scope_package(
from _pytest.python import Package

for parent in node.iter_parents():
if isinstance(parent, Package) and parent.nodeid == fixturedef.baseid:
return parent
if isinstance(parent, Package):
if fixturedef.node is not None:
if parent == fixturedef.node:
return parent
else:
if parent.nodeid == fixturedef.baseid:
return parent
return node.session


Expand Down
Loading