aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_pathoc.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2013-02-27 09:07:16 +1300
committerAldo Cortesi <aldo@nullcube.com>2013-02-27 09:07:16 +1300
commit9167b9b8b6f9235f4d4c5c3cf838dd7927a10116 (patch)
tree9553958df0e30147285fe1ca82a059d09035ee7f /test/test_pathoc.py
parent25656f488929a7c74d65a1f86cdc3bccbf8ca2c4 (diff)
downloadmitmproxy-9167b9b8b6f9235f4d4c5c3cf838dd7927a10116.tar.gz
mitmproxy-9167b9b8b6f9235f4d4c5c3cf838dd7927a10116.tar.bz2
mitmproxy-9167b9b8b6f9235f4d4c5c3cf838dd7927a10116.zip
Make pathoc request return more human-friendly.
Diffstat (limited to 'test/test_pathoc.py')
-rw-r--r--test/test_pathoc.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test_pathoc.py b/test/test_pathoc.py
index 2c86df11..52a1b5ee 100644
--- a/test/test_pathoc.py
+++ b/test/test_pathoc.py
@@ -26,8 +26,8 @@ class _TestDaemon:
ssl = self.ssl
)
c.connect()
- _, _, _, _, content = c.request("get:/api/info")
- assert tuple(json.loads(content)["version"]) == version.IVERSION
+ r = c.request("get:/api/info")
+ assert tuple(json.loads(r.content)["version"]) == version.IVERSION
class TestDaemonSSL(_TestDaemon):
@@ -41,8 +41,8 @@ class TestDaemonSSL(_TestDaemon):
)
c.connect()
c.request("get:/p/200")
- _, _, _, _, content = c.request("get:/api/log")
- d = json.loads(content)
+ r = c.request("get:/api/log")
+ d = json.loads(r.content)
assert d["log"][0]["request"]["sni"] == "foobar.com"
def test_clientcert(self):
@@ -54,8 +54,8 @@ class TestDaemonSSL(_TestDaemon):
)
c.connect()
c.request("get:/p/200")
- _, _, _, _, content = c.request("get:/api/log")
- d = json.loads(content)
+ r = c.request("get:/api/log")
+ d = json.loads(r.content)
assert d["log"][0]["request"]["clientcert"]["keyinfo"]