aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-06-06 23:08:58 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-06-06 23:08:58 -0700
commitba466dbb358eba223c49fbe602a667aa1a3c7459 (patch)
tree947bf66b7413b629eaa46355a62117a0176c5cf6 /test
parent71b6e369f8269f1da0dc373255719d7d55c52cb3 (diff)
downloadmitmproxy-ba466dbb358eba223c49fbe602a667aa1a3c7459.tar.gz
mitmproxy-ba466dbb358eba223c49fbe602a667aa1a3c7459.tar.bz2
mitmproxy-ba466dbb358eba223c49fbe602a667aa1a3c7459.zip
simplify pretty_json, improve test coverage
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/test_contentview.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/test/mitmproxy/test_contentview.py b/test/mitmproxy/test_contentview.py
index 48d6c307..f5ba45a6 100644
--- a/test/mitmproxy/test_contentview.py
+++ b/test/mitmproxy/test_contentview.py
@@ -1,5 +1,3 @@
-import json
-
from mitmproxy.exceptions import ContentViewException
from netlib.http import Headers
from netlib.odict import ODict
@@ -279,6 +277,7 @@ def test_get_by_shortcut():
def test_pretty_json():
- s = json.dumps({"foo": 1})
- assert cv.pretty_json(s)
+ assert cv.pretty_json('{"foo": 1}')
assert not cv.pretty_json("moo")
+ assert cv.pretty_json(b'{"foo" : "\xe4\xb8\x96\xe7\x95\x8c"}') # utf8 with chinese characters
+ assert not cv.pretty_json(b'{"foo" : "\xFF"}')