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

Do not asssume `Item.obj` in 'skipping' plugin 

See #2231 for discussion.
This commit is contained in:
Vidar Tonaas Fauske 2017-02-03 16:04:34 +01:00 committed by GitHub
parent da5a3dba87
commit bad261279c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
_pytest/skipping.py
View File

@ -112,6 +112,7 @@ class MarkEvaluator:
def _getglobals(self): def _getglobals(self):
d = {'os': os, 'sys': sys, 'config': self.item.config} d = {'os': os, 'sys': sys, 'config': self.item.config}
if hasattr(self.item, 'obj'):
d.update(self.item.obj.__globals__) d.update(self.item.obj.__globals__)
return d return d