p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skipping: cleanup 

remove dead comments
fix naming
remove dead code
This commit is contained in:
Ronny Pfannschmidt 2017-09-16 21:08:48 +02:00
parent e3b73682b2
commit 459cc40192
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
_pytest/skipping.py
View File

@ -65,7 +65,7 @@ class MarkEvaluator(object):
self.item = item self.item = item
self._marks = None self._marks = None
self._mark = None self._mark = None
self._repr_name = name self._mark_name = name
def __bool__(self): def __bool__(self):
self._marks = self._get_marks() self._marks = self._get_marks()
@ -77,7 +77,7 @@ class MarkEvaluator(object):
def _get_marks(self): def _get_marks(self):
keyword = self.item.keywords.get(self._repr_name) keyword = self.item.keywords.get(self._mark_name)
if isinstance(keyword, MarkDecorator): if isinstance(keyword, MarkDecorator):
return [keyword.mark] return [keyword.mark]
elif isinstance(keyword, MarkInfo): elif isinstance(keyword, MarkInfo):
@ -104,7 +104,7 @@ class MarkEvaluator(object):
fail("Error evaluating %r expression\n" fail("Error evaluating %r expression\n"
" %s\n" " %s\n"
"%s" "%s"
% (self._repr_name, self.expr, "\n".join(msg)), % (self._mark_name, self.expr, "\n".join(msg)),
pytrace=False) pytrace=False)
def _getglobals(self): def _getglobals(self):
@ -118,14 +118,8 @@ class MarkEvaluator(object):
return self.result return self.result
self._marks = self._get_marks() self._marks = self._get_marks()
def needs_eval(mark):
return mark.args or 'condition' in mark.kwargs
if self._marks: if self._marks:
self.result = False self.result = False
# "holder" might be a MarkInfo or a MarkDecorator; only
# MarkInfo keeps track of all parameters it received in an
# _arglist attribute
for mark in self._marks: for mark in self._marks:
self._mark = mark self._mark = mark
if 'condition' in mark.kwargs: if 'condition' in mark.kwargs: