aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_proxy.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-09-06 13:09:57 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-09-06 13:09:57 +0200
commit3c65510ef54c5773c22cd439488ae21dac95ee74 (patch)
tree891bebd302cbce96814556211e935b0e2a2abd9d /test/test_proxy.py
parent3a8f6488074ed7adf596637b77356553ccfca575 (diff)
downloadmitmproxy-3c65510ef54c5773c22cd439488ae21dac95ee74.tar.gz
mitmproxy-3c65510ef54c5773c22cd439488ae21dac95ee74.tar.bz2
mitmproxy-3c65510ef54c5773c22cd439488ae21dac95ee74.zip
coverage++
Diffstat (limited to 'test/test_proxy.py')
-rw-r--r--test/test_proxy.py15
1 files changed, 14 insertions, 1 deletions
diff --git a/test/test_proxy.py b/test/test_proxy.py
index 614bb8b9..b33cdcfd 100644
--- a/test/test_proxy.py
+++ b/test/test_proxy.py
@@ -3,7 +3,7 @@ from libmproxy import cmdline
from libmproxy.proxy.config import process_proxy_options
from libmproxy.proxy.connection import ServerConnection
from libmproxy.proxy.primitives import ProxyError
-from libmproxy.proxy.server import DummyServer, ProxyServer
+from libmproxy.proxy.server import DummyServer, ProxyServer, ConnectionHandler
import tutils
from libpathod import test
from netlib import http, tcp
@@ -119,6 +119,12 @@ class TestProxyServer:
opts = parser.parse_args(args=[])
tutils.raises("error starting proxy server", ProxyServer, opts, 1)
+ def test_err_2(self):
+ parser = argparse.ArgumentParser()
+ cmdline.common_options(parser)
+ opts = parser.parse_args(args=[])
+ tutils.raises("error starting proxy server", ProxyServer, opts, 8080, "invalidhost")
+
class TestDummyServer:
def test_simple(self):
@@ -126,3 +132,10 @@ class TestDummyServer:
d.start_slave()
d.shutdown()
+
+class TestConnectionHandler:
+ def test_fatal_error(self):
+ config = dict(get_upstream_server=mock.Mock(side_effect=RuntimeError))
+ c = ConnectionHandler(config, mock.MagicMock(), ("127.0.0.1", 8080), None, mock.MagicMock(), None)
+ with tutils.capture_stderr(c.handle) as output:
+ assert "mitmproxy has crashed" in output \ No newline at end of file