replace tutils.raises with pytest.raises + shim

1 files changed, 0 insertions, 59 deletions

diff --git a/mitmproxy/test/tutils.py b/mitmproxy/test/tutils.py
index 47756315..7b311492 100644
--- a/mitmproxy/test/tutils.py
+++ b/mitmproxy/test/tutils.py
@@ -4,7 +4,6 @@ import os
 import time
 import shutil
 from contextlib import contextmanager
-import sys
 
 from mitmproxy.utils import data
 from mitmproxy.net import tcp
@@ -26,64 +25,6 @@ def tmpdir(*args, **kwargs):
     shutil.rmtree(temp_workdir)
 
 
-def _check_exception(expected, actual, exc_tb):
-    if isinstance(expected, str):
-        if expected.lower() not in str(actual).lower():
-            raise AssertionError(
-                "Expected %s, but caught %s" % (
-                    repr(expected), repr(actual)
-                )
-            )
-    else:
-        if not isinstance(actual, expected):
-            raise AssertionError(
-                "Expected %s, but caught %s %s" % (
-                    expected.__name__, actual.__class__.__name__, repr(actual)
-                )
-            )
-
-
-def raises(expected_exception, obj=None, *args, **kwargs):
-    """
-        Assert that a callable raises a specified exception.
-
-        :exc An exception class or a string. If a class, assert that an
-        exception of this type is raised. If a string, assert that the string
-        occurs in the string representation of the exception, based on a
-        case-insenstivie match.
-
-        :obj A callable object.
-
-        :args Arguments to be passsed to the callable.
-
-        :kwargs Arguments to be passed to the callable.
-    """
-    if obj is None:
-        return RaisesContext(expected_exception)
-    else:
-        try:
-            ret = obj(*args, **kwargs)
-        except Exception as actual:
-            _check_exception(expected_exception, actual, sys.exc_info()[2])
-        else:
-            raise AssertionError("No exception raised. Return value: {}".format(ret))
-
-
-class RaisesContext:
-    def __init__(self, expected_exception):
-        self.expected_exception = expected_exception
-
-    def __enter__(self):
-        return
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        if not exc_type:
-            raise AssertionError("No exception raised.")
-        else:
-            _check_exception(self.expected_exception, exc_val, exc_tb)
-        return True
-
-
 def treader(bytes):
     """
         Construct a tcp.Read object from bytes.