aboutsummaryrefslogtreecommitdiffstats
path: root/test/http/test_response.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-02-08 09:52:29 +0100
committerThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-02-08 09:52:29 +0100
commit4ee1ad88fc440164985c8efc50c0be133a0053bc (patch)
tree210635d4aa964873f8054c80fcbeb2e9f94ce6ab /test/http/test_response.py
parent4873547de3c65ba7c14cace4bca7b17368b2900d (diff)
parent655b521749efd5a600d342a1d95b67d32da280a8 (diff)
downloadmitmproxy-4ee1ad88fc440164985c8efc50c0be133a0053bc.tar.gz
mitmproxy-4ee1ad88fc440164985c8efc50c0be133a0053bc.tar.bz2
mitmproxy-4ee1ad88fc440164985c8efc50c0be133a0053bc.zip
Merge pull request #120 from mitmproxy/model-cleanup
Model Cleanup
Diffstat (limited to 'test/http/test_response.py')
-rw-r--r--test/http/test_response.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/http/test_response.py b/test/http/test_response.py
index a1f4abd7..14588000 100644
--- a/test/http/test_response.py
+++ b/test/http/test_response.py
@@ -1,5 +1,7 @@
from __future__ import absolute_import, print_function, division
+import six
+
from netlib.http import Headers
from netlib.odict import ODict, ODictCaseless
from netlib.tutils import raises, tresp
@@ -8,7 +10,7 @@ from .test_message import _test_passthrough_attr, _test_decoded_attr
class TestResponseData(object):
def test_init(self):
- with raises(AssertionError):
+ with raises(ValueError if six.PY2 else TypeError):
tresp(headers="foobar")
assert isinstance(tresp(headers=None).headers, Headers)