aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_encoding.py
diff options
context:
space:
mode:
authorJim Shaver <dcypherd@gmail.com>2015-06-23 21:48:05 -0500
committerJim Shaver <dcypherd@gmail.com>2015-06-23 21:48:05 -0500
commit080e4534253338c94e6d8c86cb3679ff15410f85 (patch)
tree6322fb822332b4135f0ff14de8c2d7137016f734 /test/test_encoding.py
parentdb5c0b210b0133d7cd58124c727dbc24480e2568 (diff)
parent074d8d7c7463cdb1f0a90e165a4b3ada3554b4c2 (diff)
downloadmitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.gz
mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.bz2
mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.zip
Merge branch 'master' into hardfailvenv
Conflicts: dev
Diffstat (limited to 'test/test_encoding.py')
-rw-r--r--test/test_encoding.py22
1 files changed, 18 insertions, 4 deletions
diff --git a/test/test_encoding.py b/test/test_encoding.py
index 732447e2..e13f5dce 100644
--- a/test/test_encoding.py
+++ b/test/test_encoding.py
@@ -1,5 +1,6 @@
from libmproxy import encoding
+
def test_identity():
assert "string" == encoding.decode("identity", "string")
assert "string" == encoding.encode("identity", "string")
@@ -8,12 +9,25 @@ def test_identity():
def test_gzip():
- assert "string" == encoding.decode("gzip", encoding.encode("gzip", "string"))
+ assert "string" == encoding.decode(
+ "gzip",
+ encoding.encode(
+ "gzip",
+ "string"))
assert None == encoding.decode("gzip", "bogus")
def test_deflate():
- assert "string" == encoding.decode("deflate", encoding.encode("deflate", "string"))
- assert "string" == encoding.decode("deflate", encoding.encode("deflate", "string")[2:-4])
+ assert "string" == encoding.decode(
+ "deflate",
+ encoding.encode(
+ "deflate",
+ "string"))
+ assert "string" == encoding.decode(
+ "deflate",
+ encoding.encode(
+ "deflate",
+ "string")[
+ 2:-
+ 4])
assert None == encoding.decode("deflate", "bogus")
-