Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use get_closest_marker instead of get_marker #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions pytest_httpretty.py
Original file line number Diff line number Diff line change
@@ -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()

Expand Down