From eee24138b037daa4dd662d1a1e2d7541cef25b92 Mon Sep 17 00:00:00 2001 From: Michael Aquilina Date: Thu, 1 Oct 2015 21:56:09 +0100 Subject: [PATCH] Fix failing test --- _pytest/skipping.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/_pytest/skipping.py b/_pytest/skipping.py index 93faa4c9b..53c7311e3 100644 --- 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)