Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Since we have locks over the logs, use direct access rather than API requests to get to them

This commit is contained in:
Aldo Cortesi 2016-06-02 18:10:36 +12:00
parent 40156ce123
commit 254614e9f7
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pathod/test.py
View File

@ -75,16 +75,13 @@ class Daemon:
""" """
Return the log buffer as a list of dictionaries. Return the log buffer as a list of dictionaries.
""" """
resp = requests.get("%s/api/log" % self.urlbase, verify=False) return self.thread.server.get_log()
return resp.json()["log"]
def clear_log(self): def clear_log(self):
""" """
Clear the log. Clear the log.
""" """
self.logfp.truncate(0) return self.thread.server.clear_log()
resp = requests.get("%s/api/clear_log" % self.urlbase, verify=False)
return resp.ok
def shutdown(self): def shutdown(self):
""" """
@ -101,6 +98,7 @@ class _PaThread(threading.Thread):
self.name = "PathodThread" self.name = "PathodThread"
self.iface, self.q, self.ssl = iface, q, ssl self.iface, self.q, self.ssl = iface, q, ssl
self.daemonargs = daemonargs self.daemonargs = daemonargs
self.server = None
def run(self): def run(self):
self.server = pathod.Pathod( self.server = pathod.Pathod(

2
test/pathod/test_app.py
View File

@ -27,7 +27,7 @@ class TestApp(tutils.DaemonTests):
def test_log(self): def test_log(self):
assert self.getpath("/log").status_code == 200 assert self.getpath("/log").status_code == 200
assert self.get("200:da").status_code == 200 assert self.get("200:da").status_code == 200
id = self.d.log()[0]["id"] id = self.d.expect_log(1)[0]["id"]
assert self.getpath("/log").status_code == 200 assert self.getpath("/log").status_code == 200
assert self.getpath("/log/%s" % id).status_code == 200 assert self.getpath("/log/%s" % id).status_code == 200
assert self.getpath("/log/9999999").status_code == 404 assert self.getpath("/log/9999999").status_code == 404

7
test/pathod/test_pathod.py
View File

@ -142,11 +142,10 @@ class CommonTests(tutils.DaemonTests):
assert tuple(self.d.info()["version"]) == version.IVERSION assert tuple(self.d.info()["version"]) == version.IVERSION
def test_logs(self): def test_logs(self):
assert self.d.clear_log() self.d.clear_log()
assert not self.d.last_log()
assert self.get("202:da") assert self.get("202:da")
assert len(self.d.log()) == 1 assert self.d.expect_log(1)
assert self.d.clear_log() self.d.clear_log()
assert len(self.d.log()) == 0 assert len(self.d.log()) == 0
def test_disconnect(self): def test_disconnect(self):