aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-07-06 16:36:04 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-07-06 19:55:48 -0700
commit8287ce7e6dcf31e65519629bb064044a44de46d1 (patch)
treebdbc9dfcb7bbc317c673509134a08d0b9aca5f09 /test
parent2c37ebfc7215649cc633047c0b036de66d847af1 (diff)
downloadmitmproxy-8287ce7e6dcf31e65519629bb064044a44de46d1.tar.gz
mitmproxy-8287ce7e6dcf31e65519629bb064044a44de46d1.tar.bz2
mitmproxy-8287ce7e6dcf31e65519629bb064044a44de46d1.zip
fix tests
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/test_contrib_tnetstring.py2
-rw-r--r--test/mitmproxy/tutils.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/mitmproxy/test_contrib_tnetstring.py b/test/mitmproxy/test_contrib_tnetstring.py
index 908cec27..05c4a7c9 100644
--- a/test/mitmproxy/test_contrib_tnetstring.py
+++ b/test/mitmproxy/test_contrib_tnetstring.py
@@ -12,7 +12,7 @@ FORMAT_EXAMPLES = {
b'0:}': {},
b'0:]': [],
b'51:5:hello,39:11:12345678901#4:this,4:true!0:~4:\x00\x00\x00\x00,]}':
- {'hello': [12345678901, b'this', True, None, b'\x00\x00\x00\x00']},
+ {b'hello': [12345678901, b'this', True, None, b'\x00\x00\x00\x00']},
b'5:12345#': 12345,
b'12:this is cool,': b'this is cool',
b'19:this is unicode \xe2\x98\x85;': u'this is unicode \u2605',
diff --git a/test/mitmproxy/tutils.py b/test/mitmproxy/tutils.py
index d0a09035..5aade60c 100644
--- a/test/mitmproxy/tutils.py
+++ b/test/mitmproxy/tutils.py
@@ -130,7 +130,7 @@ def tserver_conn():
timestamp_ssl_setup=3,
timestamp_end=4,
ssl_established=False,
- sni="address",
+ sni=b"address",
via=None
))
c.reply = controller.DummyReply()