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

'xfail' markers without a condition no longer rely on the underlying `Item` 

deriving from `PyobjMixin`
This commit is contained in:
Barney Gale 2016-12-18 21:30:00 +00:00
parent 78f03888f4
commit 3d18c9c1c6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/skipping.py
View File

@ -119,7 +119,6 @@ class MarkEvaluator:
if hasattr(self, 'result'): if hasattr(self, 'result'):
return self.result return self.result
if self.holder: if self.holder:
d = self._getglobals()
if self.holder.args or 'condition' in self.holder.kwargs: if self.holder.args or 'condition' in self.holder.kwargs:
self.result = False self.result = False
# "holder" might be a MarkInfo or a MarkDecorator; only # "holder" might be a MarkInfo or a MarkDecorator; only
@ -135,6 +134,7 @@ class MarkEvaluator:
for expr in args: for expr in args:
self.expr = expr self.expr = expr
if isinstance(expr, py.builtin._basestring): if isinstance(expr, py.builtin._basestring):
d = self._getglobals()
result = cached_eval(self.item.config, expr, d) result = cached_eval(self.item.config, expr, d)
else: else:
if "reason" not in kwargs: if "reason" not in kwargs: