aboutsummaryrefslogtreecommitdiffstats
path: root/test/netlib/http/test_headers.py
diff options
context:
space:
mode:
authorClemens <cle1000.cb@gmail.com>2016-07-19 12:32:36 +0200
committerClemens <cle1000.cb@gmail.com>2016-07-19 12:32:36 +0200
commit698fb11132598a38851383f805dde5ca4d2a046d (patch)
tree95fc0184735722ccd6e4697f884496d6852e13f6 /test/netlib/http/test_headers.py
parent48728af43ad746d70ef3e251dc28b75028dea1e6 (diff)
parent18dd84b9081fb5552d5b5b2560405496445e2110 (diff)
downloadmitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.tar.gz
mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.tar.bz2
mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.zip
Merge remote-tracking branch 'origin/master' into flow_editing
Diffstat (limited to 'test/netlib/http/test_headers.py')
-rw-r--r--test/netlib/http/test_headers.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/test/netlib/http/test_headers.py b/test/netlib/http/test_headers.py
index 51819b86..51537310 100644
--- a/test/netlib/http/test_headers.py
+++ b/test/netlib/http/test_headers.py
@@ -1,4 +1,6 @@
-from netlib.http import Headers, parse_content_type
+import collections
+
+from netlib.http.headers import Headers, parse_content_type, assemble_content_type
from netlib.tutils import raises
@@ -81,3 +83,10 @@ def test_parse_content_type():
v = p("text/html; charset=UTF-8")
assert v == ('text', 'html', {'charset': 'UTF-8'})
+
+
+def test_assemble_content_type():
+ p = assemble_content_type
+ assert p("text", "html", {}) == "text/html"
+ assert p("text", "html", {"charset": "utf8"}) == "text/html; charset=utf8"
+ assert p("text", "html", collections.OrderedDict([("charset", "utf8"), ("foo", "bar")])) == "text/html; charset=utf8; foo=bar"