aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2015-06-27 09:22:41 +1200
committerAldo Cortesi <aldo@nullcube.com>2015-06-27 09:22:41 +1200
commit5f277408cf850093f42e4716ee4f5ba475ec0a4c (patch)
tree9780a967018df902ac2df8b74d2c216aeb31be96 /test
parent7990503eaf738e655b50f8fb55d6eff9bd11bdec (diff)
parentb369962cbe632588baf7b10917e3d31b91a18dbd (diff)
downloadmitmproxy-5f277408cf850093f42e4716ee4f5ba475ec0a4c.tar.gz
mitmproxy-5f277408cf850093f42e4716ee4f5ba475ec0a4c.tar.bz2
mitmproxy-5f277408cf850093f42e4716ee4f5ba475ec0a4c.zip
Merge pull request #654 from mitmproxy/remove_certforward
Remove Certforward Feature
Diffstat (limited to 'test')
-rw-r--r--test/test_server.py8
-rw-r--r--test/tservers.py2
2 files changed, 0 insertions, 10 deletions
diff --git a/test/test_server.py b/test/test_server.py
index 07b8a5f2..8cf4095b 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -757,14 +757,6 @@ class TestIncompleteResponse(tservers.HTTPProxTest):
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")
-
-
class TestUpstreamProxy(tservers.HTTPUpstreamProxTest, CommonMixin, AppMixin):
ssl = False
diff --git a/test/tservers.py b/test/tservers.py
index c70ad68a..96e340e9 100644
--- a/test/tservers.py
+++ b/test/tservers.py
@@ -89,7 +89,6 @@ class ProxTestBase(object):
no_upstream_cert = False
authenticator = None
masterclass = TestMaster
- certforward = False
@classmethod
def setupAll(cls):
@@ -131,7 +130,6 @@ class ProxTestBase(object):
no_upstream_cert = cls.no_upstream_cert,
cadir = cls.cadir,
authenticator = cls.authenticator,
- certforward = cls.certforward,
ssl_ports=([cls.server.port, cls.server2.port] if cls.ssl else []),
clientcerts = tutils.test_data.path("data/clientcert") if cls.clientcerts else None
)