Add MarkEvaluator for skip

MichaelAquilina · MichaelAquilina · commit b71add27daff · 2015-10-03T16:42:14.000+01:00
diff --git a/_pytest/skipping.py b/_pytest/skipping.py
@@ -147,10 +147,16 @@ def getexplanation(self):
 
 @pytest.hookimpl(tryfirst=True)
 def pytest_runtest_setup(item):
-    evalskip = MarkEvaluator(item, 'skipif')
-    if evalskip.istrue():
-        item._evalskip = evalskip
-        pytest.skip(evalskip.getexplanation())
+    eval_skipif = MarkEvaluator(item, 'skipif')
+    eval_skip = MarkEvaluator(item, 'skip')
+
+    if eval_skipif.istrue():
+        item._evalskip = eval_skipif
+        pytest.skip(eval_skipif.getexplanation())
+    elif eval_skip.istrue():
+        item._evalskip = eval_skip
+        pytest.skip(eval_skip.getexplanation())
+
     item._evalxfail = MarkEvaluator(item, 'xfail')
     check_xfail_no_run(item)
 
