aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-06-28 19:26:08 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-06-28 19:26:08 -0700
commit3b53d3e393f30879420b4407583c42bb1f51563e (patch)
tree19e8e462d89e5e8336a96a6ff202610a686947a0
parent042bcf7cf824551ac128ecff416e017ecc95f7e5 (diff)
downloadmitmproxy-3b53d3e393f30879420b4407583c42bb1f51563e.tar.gz
mitmproxy-3b53d3e393f30879420b4407583c42bb1f51563e.tar.bz2
mitmproxy-3b53d3e393f30879420b4407583c42bb1f51563e.zip
fix mysterious tox issue
-rw-r--r--mitmproxy/cmdline.py2
-rw-r--r--test/mitmproxy/test_proxy.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/mitmproxy/cmdline.py b/mitmproxy/cmdline.py
index d46051a2..551fffa0 100644
--- a/mitmproxy/cmdline.py
+++ b/mitmproxy/cmdline.py
@@ -323,7 +323,7 @@ def basic_options(parser):
def proxy_modes(parser):
- group = parser.add_argument_group("Proxy Modes").add_mutually_exclusive_group()
+ group = parser.add_argument_group("Proxy Modes")
group.add_argument(
"-R", "--reverse",
action="store",
diff --git a/test/mitmproxy/test_proxy.py b/test/mitmproxy/test_proxy.py
index 49c9c909..cd24fc9f 100644
--- a/test/mitmproxy/test_proxy.py
+++ b/test/mitmproxy/test_proxy.py
@@ -96,7 +96,7 @@ class TestProcessProxyOptions:
self.assert_err("expected one argument", "--upstream-auth")
self.assert_err("Invalid upstream auth specification", "--upstream-auth", "test")
- self.assert_err("not allowed with", "-R", "http://localhost", "-T")
+ self.assert_err("mutually exclusive", "-R", "http://localhost", "-T")
def test_socks_auth(self):
self.assert_err("Proxy Authentication not supported in SOCKS mode.", "--socks", "--nonanonymous")