aboutsummaryrefslogtreecommitdiffstats
path: root/test/netlib
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-09-21 21:00:07 -0700
committerGitHub <noreply@github.com>2016-09-21 21:00:07 -0700
commitd5427c7298b0c6aee009a86dec041011427689e9 (patch)
tree00b84f3a616c1c2c6e3469c2fb2a0be4a9d5e265 /test/netlib
parent1e5a5b03f8d56df62a04a368bd5eb2d59cb7582a (diff)
parentf1d519d7c4231513c868179abf0fbfbb9387e633 (diff)
downloadmitmproxy-d5427c7298b0c6aee009a86dec041011427689e9.tar.gz
mitmproxy-d5427c7298b0c6aee009a86dec041011427689e9.tar.bz2
mitmproxy-d5427c7298b0c6aee009a86dec041011427689e9.zip
Merge pull request #1563 from mhils/fix-1562
Raise TypeError on invalid header assignment, fix #1562
Diffstat (limited to 'test/netlib')
-rw-r--r--test/netlib/http/test_headers.py9
-rw-r--r--test/netlib/test_strutils.py2
2 files changed, 11 insertions, 0 deletions
diff --git a/test/netlib/http/test_headers.py b/test/netlib/http/test_headers.py
index ad2bc548..e8752c52 100644
--- a/test/netlib/http/test_headers.py
+++ b/test/netlib/http/test_headers.py
@@ -43,6 +43,15 @@ class TestHeaders(object):
with raises(TypeError):
Headers([[b"Host", u"not-bytes"]])
+ def test_set(self):
+ headers = Headers()
+ headers[u"foo"] = u"1"
+ headers[b"bar"] = b"2"
+ headers["baz"] = b"3"
+ with raises(TypeError):
+ headers["foobar"] = 42
+ assert len(headers) == 3
+
def test_bytes(self):
headers = Headers(Host="example.com")
assert bytes(headers) == b"Host: example.com\r\n"
diff --git a/test/netlib/test_strutils.py b/test/netlib/test_strutils.py
index 5be254a3..0f58cac5 100644
--- a/test/netlib/test_strutils.py
+++ b/test/netlib/test_strutils.py
@@ -8,6 +8,8 @@ def test_always_bytes():
assert strutils.always_bytes("foo") == b"foo"
with tutils.raises(ValueError):
strutils.always_bytes(u"\u2605", "ascii")
+ with tutils.raises(TypeError):
+ strutils.always_bytes(42, "ascii")
def test_native():