aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_tcp.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-01-09 01:57:50 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-01-09 01:57:50 +0100
commitb0b93d1c3e489cfeaf89bf5741e923c4388ab45a (patch)
tree69c17045c7f5f2fffa3b31c645e16eeaf5501bea /test/test_tcp.py
parent951f2d517fa2e464d654a54bebacbd983f944c62 (diff)
parentac1a700fa16e2ae2146425844823bff70cc86f4b (diff)
downloadmitmproxy-b0b93d1c3e489cfeaf89bf5741e923c4388ab45a.tar.gz
mitmproxy-b0b93d1c3e489cfeaf89bf5741e923c4388ab45a.tar.bz2
mitmproxy-b0b93d1c3e489cfeaf89bf5741e923c4388ab45a.zip
Merge remote-tracking branch 'origin/master' into tcp_proxy
Diffstat (limited to 'test/test_tcp.py')
-rw-r--r--test/test_tcp.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/test/test_tcp.py b/test/test_tcp.py
index a4e66516..7f2c21c4 100644
--- a/test/test_tcp.py
+++ b/test/test_tcp.py
@@ -133,7 +133,6 @@ class TestFinishFail(test.ServerTestBase):
c.wfile.flush()
c.rfile.read(4)
-
class TestDisconnect(test.ServerTestBase):
handler = EchoHandler
def test_echo(self):