aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2014-03-02 22:10:49 +1300
committerAldo Cortesi <aldo@nullcube.com>2014-03-02 22:10:49 +1300
commit944f213ebca3bb70e0dc920d7095ae888cee2c8c (patch)
tree9be58d004128ce79db2bb950cb7b9411e58da1ab /test
parent602e400cccd10b7a790c7d353d508fe36f560f60 (diff)
downloadmitmproxy-944f213ebca3bb70e0dc920d7095ae888cee2c8c.tar.gz
mitmproxy-944f213ebca3bb70e0dc920d7095ae888cee2c8c.tar.bz2
mitmproxy-944f213ebca3bb70e0dc920d7095ae888cee2c8c.zip
Add connection cipher info to pathod server log
Diffstat (limited to 'test')
-rw-r--r--test/test_pathod.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/test/test_pathod.py b/test/test_pathod.py
index c98e1408..1ab33095 100644
--- a/test/test_pathod.py
+++ b/test/test_pathod.py
@@ -94,7 +94,7 @@ class TestNohang(tutils.DaemonTests):
r = self.get("200:p0,0")
assert r.status_code == 800
l = self.d.last_log()
- assert "Pauses have been disabled" in l["msg"]
+ assert "Pauses have been disabled" in l["response"]["msg"]
class TestHexdump(tutils.DaemonTests):
@@ -113,7 +113,7 @@ class CommonTests(tutils.DaemonTests):
r = self.get("200:b@1g")
assert r.status_code == 800
l = self.d.last_log()
- assert "too large" in l["msg"]
+ assert "too large" in l["response"]["msg"]
def test_preline(self):
r = self.pathoc(r"get:'/p/200':i0,'\r\n'")
@@ -219,3 +219,10 @@ class TestDaemonSSL(CommonTests):
assert l["type"] == "error"
assert "SSL" in l["msg"]
+ def test_ssl_cipher(self):
+ r = self.pathoc(r"get:/p/202")
+ assert r.status_code == 202
+ assert self.d.last_log()["cipher"][1] > 0
+
+
+