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

pytest 2.7 compatibility.

This commit is contained in:
Niclas Olofsson 2015-09-26 15:23:11 +02:00 committed by David Szotten
parent 33f1ff4e8c
commit bd9495486b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pytest_stepwise/compat.py
View File

@ -1,4 +1,12 @@
import pytest
try: try:
from _pytest.cacheprovider import Cache from _pytest.cacheprovider import Cache
except ImportError: except ImportError:
from pytest_cache import Cache from pytest_cache import Cache
if hasattr(pytest, 'hookimpl'):
tryfirst = pytest.hookimpl(tryfirst=True)
else:
tryfirst = pytest.mark.tryfirst

5
pytest_stepwise/plugin.py
View File

@ -1,5 +1,4 @@
import pytest from .compat import Cache, tryfirst
from .compat import Cache
def pytest_addoption(parser): def pytest_addoption(parser):
@ -12,7 +11,7 @@ def pytest_addoption(parser):
help='ignore the first failing test but stop on the next failing test') help='ignore the first failing test but stop on the next failing test')
@pytest.hookimpl(tryfirst=True) @tryfirst
def pytest_configure(config): def pytest_configure(config):
config.cache = Cache(config) config.cache = Cache(config)
config.pluginmanager.register(StepwisePlugin(config), 'stepwiseplugin') config.pluginmanager.register(StepwisePlugin(config), 'stepwiseplugin')