diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-08-16 13:18:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-16 13:18:54 -0700 |
| commit | f922b7aaf5c45305599c2d996d6847ac73cf73b5 (patch) | |
| tree | a41e83fc3871a147a5159ae198fd451b7f058396 /test | |
| parent | bfe22e739cd96620ec17474e514350ff9a52e34e (diff) | |
| parent | eb83107e1c0ac8ddb0d198d71feac76939463f08 (diff) | |
| download | mitmproxy-f922b7aaf5c45305599c2d996d6847ac73cf73b5.tar.gz mitmproxy-f922b7aaf5c45305599c2d996d6847ac73cf73b5.tar.bz2 mitmproxy-f922b7aaf5c45305599c2d996d6847ac73cf73b5.zip | |
Merge pull request #1484 from mitmproxy/fix-1476
fix #1476
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/test_proxy.py | 26 | ||||
| -rw-r--r-- | test/mitmproxy/test_server.py | 5 |
2 files changed, 18 insertions, 13 deletions
diff --git a/test/mitmproxy/test_proxy.py b/test/mitmproxy/test_proxy.py index 84838018..f7c64e50 100644 --- a/test/mitmproxy/test_proxy.py +++ b/test/mitmproxy/test_proxy.py @@ -85,22 +85,22 @@ class TestProcessProxyOptions: @mock.patch("mitmproxy.platform.resolver") 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("--upstream-auth", "test:test") - # self.assert_err("expected one argument", "--upstream-auth") + 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("--upstream-auth", "test:test") + self.assert_err("expected one argument", "--upstream-auth") self.assert_err( "Invalid upstream auth specification", "--upstream-auth", "test" ) - # self.assert_err("mutually exclusive", "-R", "http://localhost", "-T") + self.assert_err("mutually exclusive", "-R", "http://localhost", "-T") def test_socks_auth(self): self.assert_err( diff --git a/test/mitmproxy/test_server.py b/test/mitmproxy/test_server.py index 78a97dc3..e0a8da47 100644 --- a/test/mitmproxy/test_server.py +++ b/test/mitmproxy/test_server.py @@ -472,6 +472,11 @@ class TestReverse(tservers.ReverseProxyTest, CommonMixin, TcpMixin): reverse = True +class TestReverseSSL(tservers.ReverseProxyTest, CommonMixin, TcpMixin): + reverse = True + ssl = True + + class TestSocks5(tservers.SocksModeTest): def test_simple(self): |