Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 08:11:00 +00:00
Code Issues Projects Releases Wiki Activity

fix tests, don't double-add error'd flows

Browse Source
This commit is contained in:
Maximilian Hils 2016-05-11 16:34:18 -06:00
parent acd51befbb
commit d3c30d9005
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mitmproxy/flow.py
View File

@ -1116,8 +1116,6 @@ class FlowMaster(controller.ServerMaster):
flow.reply() flow.reply()
def handle_tcp_error(self, flow): def handle_tcp_error(self, flow):
if self.stream:
self.stream.add(flow)
self.add_event("Error in TCP connection to {}: {}".format( self.add_event("Error in TCP connection to {}: {}".format(
repr(flow.server_conn.address), repr(flow.server_conn.address),
flow.error flow.error

4
test/mitmproxy/tservers.py
View File

@ -161,7 +161,9 @@ class HTTPProxyTest(ProxyTestBase):
q = "get:'/p/%s'" % spec q = "get:'/p/%s'" % spec
else: else:
q = "get:'%s/p/%s'" % (self.server.urlbase, spec) q = "get:'%s/p/%s'" % (self.server.urlbase, spec)
return p.request(q) resp = p.request(q)
p.close()
return resp
def app(self, page): def app(self, page):
if self.ssl: if self.ssl: