From 0bd3d0ff4c3c51aeae2ce1735c9028a1ac34cdaa Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <thomas@kriechbaumer.name>
Date: Wed, 24 May 2017 10:36:29 +0200
Subject: upgrade pytest and remove our pytest.raises wrapper

---
 test/conftest.py | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'test')

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
-################################################################################
-- 
cgit v1.2.3