aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_encoding.py
diff options
context:
space:
mode:
authorJim Shaver <dcypherd@gmail.com>2015-05-31 01:21:44 -0400
committerJim Shaver <dcypherd@gmail.com>2015-05-31 01:21:44 -0400
commitb51363b3ca43f6572acb673186e6ae78a1f48434 (patch)
treea7488b32871c142141a813dc6ff2ede172672c31 /test/test_encoding.py
parent4fe2c069cca07aadf983f54e18dac4de492d5d69 (diff)
parent06fba18106a8f759ec6f08453e86772a170c653b (diff)
downloadmitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.gz
mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.bz2
mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.zip
Merge remote-tracking branch 'upstream/master' into print-bracket-fix
Conflicts: examples/har_extractor.py examples/nonblocking.py examples/read_dumpfile libmproxy/web/app.py
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")
-