diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-11 02:16:30 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-11 02:16:30 +0100 |
| commit | 14db30080f17762bc6bb9d75c5d90bf51494b873 (patch) | |
| tree | fb4ae3cbfbc37fdc465aaf36247efd1a05e2628f /test | |
| parent | 15c82f743f6969b11afe17ecb82840e70d6b3ba3 (diff) | |
| parent | e89e035d4a2c52aff77fdb3eaa01e8bdb1539a17 (diff) | |
| download | mitmproxy-14db30080f17762bc6bb9d75c5d90bf51494b873.tar.gz mitmproxy-14db30080f17762bc6bb9d75c5d90bf51494b873.tar.bz2 mitmproxy-14db30080f17762bc6bb9d75c5d90bf51494b873.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_server.py | 7 | ||||
| -rw-r--r-- | test/tservers.py | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/test/test_server.py b/test/test_server.py index 8bde3bff..e1da3125 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -446,3 +446,10 @@ class TestIncompleteResponse(tservers.HTTPProxTest): def test_incomplete(self): assert self.pathod("200").status_code == 502 + +class TestCertForward(tservers.HTTPProxTest): + certforward = True + ssl = True + def test_app_err(self): + tutils.raises("handshake error", self.pathod, "200:b@100") + diff --git a/test/tservers.py b/test/tservers.py index 9ad3b735..7548ebc4 100644 --- a/test/tservers.py +++ b/test/tservers.py @@ -81,6 +81,7 @@ class ProxTestBase(object): authenticator = None masterclass = TestMaster externalapp = False + certforward = False @classmethod def setupAll(cls): cls.server = libpathod.test.Daemon(ssl=cls.ssl, ssloptions=cls.ssloptions) @@ -91,6 +92,7 @@ class ProxTestBase(object): no_upstream_cert = cls.no_upstream_cert, confdir = cls.confdir, authenticator = cls.authenticator, + certforward = cls.certforward, **pconf ) tmaster = cls.masterclass(config) |