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

player nicer for missing parent Module objects for a collected function (bug triggered by oejskit) 

--HG--
branch : trunk
This commit is contained in:
holger krekel 2009-10-20 16:38:12 +02:00
parent fabd967595
commit 9910db2ca6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_py/test/plugin/pytest_skipping.py
View File

@ -175,7 +175,8 @@ def getexpression(item, keyword):
if cls and hasattr(cls.obj, keyword): if cls and hasattr(cls.obj, keyword):
return getattr(cls.obj, keyword) return getattr(cls.obj, keyword)
mod = item.getparent(py.test.collect.Module) mod = item.getparent(py.test.collect.Module)
return getattr(mod.obj, keyword, None) if mod:
return getattr(mod.obj, keyword, None)
def evalexpression(item, keyword): def evalexpression(item, keyword):
expr = getexpression(item, keyword) expr = getexpression(item, keyword)

3
testing/pytest/plugin/test_pytest_skipping.py
View File

@ -110,6 +110,9 @@ def test_getexpression(testdir):
assert getexpression(item2, 'just') assert getexpression(item2, 'just')
item2.parent = None
assert not getexpression(item2, 'nada')
def test_evalexpression_cls_config_example(testdir): def test_evalexpression_cls_config_example(testdir):
from _py.test.plugin.pytest_skipping import evalexpression from _py.test.plugin.pytest_skipping import evalexpression
item, = testdir.getitems(""" item, = testdir.getitems("""