aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-09-06 12:43:32 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-09-06 12:43:32 +0200
commitfdd7b2f108717900e39e3d0ab220ee65b79304ef (patch)
treec3f5aed62bcf13378522968a1c77375dc8102b53 /test
parentccb61829175b6ecb15cc753c5d134fe7b445b2ef (diff)
parent0e0cff638c1e055275e77e2af0ae540542f77197 (diff)
downloadmitmproxy-fdd7b2f108717900e39e3d0ab220ee65b79304ef.tar.gz
mitmproxy-fdd7b2f108717900e39e3d0ab220ee65b79304ef.tar.bz2
mitmproxy-fdd7b2f108717900e39e3d0ab220ee65b79304ef.zip
Merge branch 'issue_341' into server_change_api
Diffstat (limited to 'test')
-rw-r--r--test/test_proxy.py20
1 files changed, 16 insertions, 4 deletions
diff --git a/test/test_proxy.py b/test/test_proxy.py
index 073e76b5..2f455992 100644
--- a/test/test_proxy.py
+++ b/test/test_proxy.py
@@ -78,12 +78,24 @@ class TestProcessProxyOptions:
def test_no_transparent(self):
self.assert_err("transparent mode not supported", "-T")
+
@mock.patch("libmproxy.platform.resolver")
- def test_transparent_reverse(self, _):
- self.assert_err("mutually exclusive", "-R", "http://localhost", "-T")
- self.assert_noerr("-T")
- self.assert_err("Invalid server specification", "-R", "reverse")
+ def test_modes(self, _):
self.assert_noerr("-R", "http://localhost")
+ self.assert_err("expected one argument", "-R")
+ self.assert_err("Invalid server specification", "-R", "reverse")
+
+ self.assert_noerr("-T")
+
+ self.assert_noerr("-U", "http://localhost")
+ self.assert_err("expected one argument", "-U")
+ self.assert_err("Invalid server specification", "-U", "upstream")
+
+ self.assert_noerr("--destination-server", "http://localhost")
+ self.assert_err("expected one argument", "--destination-server")
+ self.assert_err("Invalid server specification", "--destination-server", "manual")
+
+ self.assert_err("mutually exclusive", "-R", "http://localhost", "-T")
def test_client_certs(self):
with tutils.tmpdir() as confdir: