aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_server.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-09-04 14:18:07 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-09-04 14:18:07 +0200
commit1135666ee6fb145491eb6d07435eb0cf58b2094f (patch)
tree843fbfe8c708d8b260ea74fe7d98b3bad4bd1c6f /test/test_server.py
parent649e63ff3c868397f493e1dabdc1c63d572aedd8 (diff)
parent39fa579dd564823171f804c4307ab93db4d3b961 (diff)
downloadmitmproxy-1135666ee6fb145491eb6d07435eb0cf58b2094f.tar.gz
mitmproxy-1135666ee6fb145491eb6d07435eb0cf58b2094f.tar.bz2
mitmproxy-1135666ee6fb145491eb6d07435eb0cf58b2094f.zip
Merge branch 'master' into issue_341
Diffstat (limited to 'test/test_server.py')
-rw-r--r--test/test_server.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/test/test_server.py b/test/test_server.py
index 48527547..6c0829f4 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -108,13 +108,6 @@ class TestHTTP(tservers.HTTPProxTest, CommonMixin, AppMixin):
assert p.request(req)
assert p.request(req)
- def test_proxy_ioerror(self):
- # Tests a difficult-to-trigger condition, where an IOError is raised
- # within our read loop.
- with mock.patch("libmproxy.protocol.http.HTTPRequest.from_stream") as m:
- m.side_effect = IOError("error!")
- tutils.raises("server disconnect", self.pathod, "304")
-
def test_get_connection_switching(self):
def switched(l):
for i in l: