jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix failing test

This commit is contained in:
Michael Aquilina 2015-10-01 21:56:09 +01:00
parent 04545f8a54
commit eee24138b0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_pytest/skipping.py
View File

@ -155,9 +155,8 @@ def pytest_runtest_setup(item):
pytest.skip(eval_skipif.getexplanation()) pytest.skip(eval_skipif.getexplanation())
elif isinstance(item.keywords.get('skip'), MarkInfo): elif isinstance(item.keywords.get('skip'), MarkInfo):
eval_skip = MarkEvaluator(item, 'skip') eval_skip = MarkEvaluator(item, 'skip')
if eval_skip.istrue(): item._evalskip = eval_skip
item._evalskip = eval_skip pytest.skip(eval_skip.getexplanation())
pytest.skip(eval_skip.getexplanation())
item._evalxfail = MarkEvaluator(item, 'xfail') item._evalxfail = MarkEvaluator(item, 'xfail')
check_xfail_no_run(item) check_xfail_no_run(item)