Working (I think) fix for #2836

This commit is contained in:
Tom Dalton 2017-10-23 13:26:42 +01:00
parent c03612f729
commit 1e6dc6f8e5
2 changed files with 53 additions and 1 deletions

View File

@ -1130,7 +1130,41 @@ class FixtureManager:
else: else:
return tuple(self._matchfactories(fixturedefs, nodeid)) return tuple(self._matchfactories(fixturedefs, nodeid))
@classmethod
def _splitnode(cls, nodeid):
"""Split a nodeid into constituent 'parts'.
Node IDs are strings, and can be things like:
'',
'testing/code',
'testing/code/test_excinfo.py'
'testing/code/test_excinfo.py::TestFormattedExcinfo::()'
"""
if nodeid == '':
return []
sep = py.path.local.sep
parts = nodeid.split(sep)
if parts:
last_part = parts[-1]
if '::' in last_part:
namespace_parts = last_part.split("::")
parts[-1:] = namespace_parts
return parts
@classmethod
def _ischildnode(cls, baseid, nodeid):
"""Return True if the nodeid is a child node of the baseid.
E.g. 'foo/bar::Baz::()' is a child of 'foo', 'foo/bar' and 'foo/bar::Baz', but not of 'foo/blorp'
"""
base_parts = cls._splitnode(baseid)
node_parts = cls._splitnode(nodeid)
if len(node_parts) < len(base_parts):
return False
return node_parts[:len(base_parts)] == base_parts
def _matchfactories(self, fixturedefs, nodeid): def _matchfactories(self, fixturedefs, nodeid):
for fixturedef in fixturedefs: for fixturedef in fixturedefs:
if nodeid.startswith(fixturedef.baseid): if self._ischildnode(fixturedef.baseid, nodeid):
yield fixturedef yield fixturedef

18
testing/test_fixtures.py Normal file
View File

@ -0,0 +1,18 @@
import pytest
from _pytest import fixtures
@pytest.mark.parametrize("baseid, nodeid, expected", (
('', '', True),
('', 'foo', True),
('', 'foo/bar', True),
('', 'foo/bar::TestBaz::()', True),
('foo', 'food', False),
('foo/bar::TestBaz::()', 'foo/bar', False),
('foo/bar::TestBaz::()', 'foo/bar::TestBop::()', False),
('foo/bar', 'foo/bar::TestBop::()', True),
))
def test_fixturemanager_ischildnode(baseid, nodeid, expected):
result = fixtures.FixtureManager._ischildnode(baseid, nodeid)
assert result is expected