(antocuni, ronny around): import directly from _pytest.runner to avoid the usage of @property
This commit is contained in:
parent
37c47155e0
commit
ba0100e057
|
@ -10,6 +10,7 @@ except ImportError:
|
|||
from UserDict import DictMixin as MappingMixin
|
||||
|
||||
from _pytest.mark import MarkInfo
|
||||
import _pytest.runner
|
||||
|
||||
tracebackcutdir = py.path.local(_pytest.__file__).dirpath()
|
||||
|
||||
|
@ -348,16 +349,9 @@ class Collector(Node):
|
|||
and thus iteratively build a tree.
|
||||
"""
|
||||
|
||||
_skip_exceptions = None
|
||||
@property
|
||||
def skip_exceptions(self):
|
||||
if self._skip_exceptions is None:
|
||||
return (py.test.skip.Exception,)
|
||||
return self._skip_exceptions
|
||||
|
||||
@skip_exceptions.setter
|
||||
def skip_exceptions(self, value):
|
||||
self._skip_exceptions = value
|
||||
# the set of exceptions to interpret as "Skip the whole module" during
|
||||
# collection
|
||||
skip_exceptions = (_pytest.runner.Skipped,)
|
||||
|
||||
class CollectError(Exception):
|
||||
""" an error during collection, contains a custom message. """
|
||||
|
|
Loading…
Reference in New Issue