floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add nose.SkipTest for python2.6 -- which apparently is a subclass from python2.7 on. 

addresses issue236
This commit is contained in:
holger krekel 2013-09-06 12:48:54 +02:00
parent 41df742faf
commit 109e2f215f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
_pytest/nose.py
View File

@ -5,13 +5,13 @@ import inspect
import sys import sys
from _pytest import unittest from _pytest import unittest
def pytest_runtest_makereport(__multicall__, item, call): def pytest_runtest_makereport(__multicall__, item, call):
SkipTest = getattr(sys.modules.get('nose', None), 'SkipTest', None) SkipTest = getattr(sys.modules.get('nose', None), 'SkipTest', None)
if SkipTest: if SkipTest:
if call.excinfo and call.excinfo.errisinstance(SkipTest): if call.excinfo and call.excinfo.errisinstance(SkipTest):
# let's substitute the excinfo with a py.test.skip one # let's substitute the excinfo with a py.test.skip one
call2 = call.__class__(lambda: py.test.skip(str(call.excinfo.value)), call.when) call2 = call.__class__(lambda:
pytest.skip(str(call.excinfo.value)), call.when)
call.excinfo = call2.excinfo call.excinfo = call2.excinfo
@ -40,10 +40,12 @@ def teardown_nose(item):
# del item.parent._nosegensetup # del item.parent._nosegensetup
def pytest_make_collect_report(collector): def pytest_make_collect_report(collector):
if sys.modules.get("unittest"): SkipTest = getattr(sys.modules.get('unittest', None), 'SkipTest', None)
SkipTest = getattr(py.std.unittest, "SkipTest", None) if SkipTest is not None:
if SkipTest is not None: collector.skip_exceptions += (SkipTest,)
collector.skip_exceptions += (SkipTest,) SkipTest = getattr(sys.modules.get('nose', None), 'SkipTest', None)
if SkipTest is not None:
collector.skip_exceptions += (SkipTest,)
if isinstance(collector, pytest.Generator): if isinstance(collector, pytest.Generator):
call_optional(collector.obj, 'setup') call_optional(collector.obj, 'setup')