aboutsummaryrefslogtreecommitdiffstats
path: root/test/tutils.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-03-07 01:22:02 +0100
committerMaximilian Hils <git@maximilianhils.com>2015-03-07 01:22:02 +0100
commitdbadc1b61327d06bb176d0465ad5831a619126be (patch)
tree34cf445e45f0872adf6b101459f3201ec9f59a72 /test/tutils.py
parent24a3dd59fec825afeff8cb62426f963653e8476a (diff)
downloadmitmproxy-dbadc1b61327d06bb176d0465ad5831a619126be.tar.gz
mitmproxy-dbadc1b61327d06bb176d0465ad5831a619126be.tar.bz2
mitmproxy-dbadc1b61327d06bb176d0465ad5831a619126be.zip
clean up cert handling, fix mitmproxy/mitmproxy#472
Diffstat (limited to 'test/tutils.py')
-rw-r--r--test/tutils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/tutils.py b/test/tutils.py
index c8e06b96..ea30f59c 100644
--- a/test/tutils.py
+++ b/test/tutils.py
@@ -31,7 +31,7 @@ def raises(exc, obj, *args, **kwargs):
:kwargs Arguments to be passed to the callable.
"""
try:
- apply(obj, args, kwargs)
+ ret = apply(obj, args, kwargs)
except Exception, v:
if isinstance(exc, basestring):
if exc.lower() in str(v).lower():
@@ -51,6 +51,6 @@ def raises(exc, obj, *args, **kwargs):
exc.__name__, v.__class__.__name__, str(v)
)
)
- raise AssertionError("No exception raised.")
+ raise AssertionError("No exception raised. Return value: {}".format(ret))
test_data = utils.Data(__name__)