diff options
Diffstat (limited to 'keystone/test.py')
| -rw-r--r-- | keystone/test.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/keystone/test.py b/keystone/test.py index 1e733ed2..686de583 100644 --- a/keystone/test.py +++ b/keystone/test.py @@ -32,7 +32,7 @@ from keystone.common import wsgi LOG = logging.getLogger(__name__) -ROOTDIR = os.path.dirname(os.path.dirname(__file__)) +ROOTDIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) VENDOR = os.path.join(ROOTDIR, 'vendor') TESTSDIR = os.path.join(ROOTDIR, 'tests') ETCDIR = os.path.join(ROOTDIR, 'etc') @@ -236,9 +236,13 @@ class TestCase(unittest.TestCase): def appconfig(self, config): return deploy.appconfig(self._paste_config(config)) - def serveapp(self, config, name=None): + def serveapp(self, config, name=None, cert=None, key=None, ca=None, + cert_required=None): app = self.loadapp(config, name=name) server = wsgi.Server(app, host="127.0.0.1", port=0) + if cert is not None and ca is not None and key is not None: + server.set_ssl(certfile=cert, keyfile=key, ca_certs=ca, + cert_required=cert_required) server.start(key='socket') # Service catalog tests need to know the port we ran on. |