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

mitmproxy/flow.py

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

test/mitmproxy/tservers.py

@@ -161,7 +161,9 @@ class HTTPProxyTest(ProxyTestBase):
             q = "get:'/p/%s'" % spec
         else:
             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):
         if self.ssl: