diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-08-18 17:25:55 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-08-24 09:19:42 +0200 |
| commit | 51771c01c61259d8cc62ff8cc9715dced9806354 (patch) | |
| tree | cfce94b22c31f723686258b0d78d6d95d6c0569d | |
| parent | bee7d368dde2c0275459fb61fa9e544faa784a19 (diff) | |
| download | mitmproxy-51771c01c61259d8cc62ff8cc9715dced9806354.tar.gz mitmproxy-51771c01c61259d8cc62ff8cc9715dced9806354.tar.bz2 mitmproxy-51771c01c61259d8cc62ff8cc9715dced9806354.zip | |
allow test classes to dynamically specify ssl context
| -rw-r--r-- | test/netlib/tservers.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/netlib/tservers.py b/test/netlib/tservers.py index 666f97ac..a80dcb28 100644 --- a/test/netlib/tservers.py +++ b/test/netlib/tservers.py @@ -100,7 +100,8 @@ class ServerTestBase(object): @classmethod def makeserver(cls, **kwargs): - return _TServer(cls.ssl, cls.q, cls.handler, cls.addr, **kwargs) + ssl = kwargs.pop('ssl', cls.ssl) + return _TServer(ssl, cls.q, cls.handler, cls.addr, **kwargs) @classmethod def teardown_class(cls): |