Fix failing test

2015-10-01 21:56:09 +01:00
parent 04545f8a54
commit eee24138b0
1 changed files with 2 additions and 3 deletions
--- a/_pytest/skipping.py
+++ b/_pytest/skipping.py
@@ -155,9 +155,8 @@ def pytest_runtest_setup(item):
        pytest.skip(eval_skipif.getexplanation())
    elif isinstance(item.keywords.get('skip'), MarkInfo):
        eval_skip = MarkEvaluator(item, 'skip')
-        if eval_skip.istrue():
-            item._evalskip = eval_skip
-            pytest.skip(eval_skip.getexplanation())
+        item._evalskip = eval_skip
+        pytest.skip(eval_skip.getexplanation())

    item._evalxfail = MarkEvaluator(item, 'xfail')
    check_xfail_no_run(item)