Do not asssume Item.obj in 'skipping' plugin

See #2231 for discussion.
2017-02-03 16:04:34 +01:00
parent da5a3dba87
commit bad261279c
1 changed files with 2 additions and 1 deletions
--- a/_pytest/skipping.py
+++ b/_pytest/skipping.py
@@ -112,7 +112,8 @@ class MarkEvaluator:

    def _getglobals(self):
        d = {'os': os, 'sys': sys, 'config': self.item.config}
-        d.update(self.item.obj.__globals__)
+        if hasattr(self.item, 'obj'):
+            d.update(self.item.obj.__globals__)
        return d

    def _istrue(self):