diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-05-24 10:36:29 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-05-24 11:35:53 +0200 |
| commit | 0bd3d0ff4c3c51aeae2ce1735c9028a1ac34cdaa (patch) | |
| tree | 4fa262ae8f5fa132860724df74e22696fce3197b /test | |
| parent | 4961d782ed344b5f36bf5b44b8b4b247dcef2605 (diff) | |
| download | mitmproxy-0bd3d0ff4c3c51aeae2ce1735c9028a1ac34cdaa.tar.gz mitmproxy-0bd3d0ff4c3c51aeae2ce1735c9028a1ac34cdaa.tar.bz2 mitmproxy-0bd3d0ff4c3c51aeae2ce1735c9028a1ac34cdaa.zip | |
upgrade pytest and remove our pytest.raises wrapper
Diffstat (limited to 'test')
| -rw-r--r-- | test/conftest.py | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/test/conftest.py b/test/conftest.py index b4e1da93..50b38197 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -32,21 +32,3 @@ skip_appveyor = pytest.mark.skipif( def disable_alpn(monkeypatch): monkeypatch.setattr(mitmproxy.net.tcp, 'HAS_ALPN', False) monkeypatch.setattr(OpenSSL.SSL._lib, 'Cryptography_HAS_ALPN', False) - - -################################################################################ -# TODO: remove this wrapper when pytest 3.1.0 is released -original_pytest_raises = pytest.raises - - -@contextmanager -@functools.wraps(original_pytest_raises) -def raises(exc, *args, **kwargs): - with original_pytest_raises(exc, *args, **kwargs) as exc_info: - yield - if 'match' in kwargs: - assert exc_info.match(kwargs['match']) - - -pytest.raises = raises -################################################################################ |