From 51771c01c61259d8cc62ff8cc9715dced9806354 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Thu, 18 Aug 2016 17:25:55 +0200 Subject: [PATCH] allow test classes to dynamically specify ssl context --- test/netlib/tservers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/netlib/tservers.py b/test/netlib/tservers.py index 666f97ac8..a80dcb28e 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):