From f1295e9433f4a2c0ca947d11ed1ef2089b779743 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Sat, 6 Jun 2026 09:39:44 +0300 Subject: [PATCH] fixtures: use node-based matching in `get_scope_package` when possible We are trying to move away from nodeid-based matching. --- src/_pytest/fixtures.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py index 9e123be230a..539648c8c44 100644 --- a/src/_pytest/fixtures.py +++ b/src/_pytest/fixtures.py @@ -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