diff --git a/pytest_httpretty.py b/pytest_httpretty.py index 6ffafa5..83363c7 100644 --- a/pytest_httpretty.py +++ b/pytest_httpretty.py @@ -1,25 +1,37 @@ +from distutils.version import LooseVersion import functools import httpretty - +import pytest __version__ = '0.2.0' +def get_marker_method(item): + _marker_method = None + pytest_version = LooseVersion("{}".format(pytest.__version__)) + if pytest_version < LooseVersion("4.1.0"): + _marker_method = item.get_marker('httpretty') + else: + _marker_method = item.get_closest_marker('httpretty') + + return _marker_method + + def pytest_configure(config): config.addinivalue_line('markers', 'httpretty: mark tests to activate HTTPretty.') def pytest_runtest_setup(item): - marker = item.get_marker('httpretty') + marker = get_marker_method(item) if marker is not None: httpretty.reset() httpretty.enable() def pytest_runtest_teardown(item, nextitem): - marker = item.get_marker('httpretty') + marker = get_marker_method(item) if marker is not None: httpretty.disable()