From 92d11d139e9f76d4fd76859aea78643fc32ef36b Mon Sep 17 00:00:00 2001 From: asteroide Date: Thu, 24 Sep 2015 16:27:16 +0200 Subject: Update Keystone code from repository. Change-Id: Ib3d0a06b10902fcc6d520f58e85aa617bc326d00 --- keystone-moon/keystone/tests/unit/test_ssl.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'keystone-moon/keystone/tests/unit/test_ssl.py') diff --git a/keystone-moon/keystone/tests/unit/test_ssl.py b/keystone-moon/keystone/tests/unit/test_ssl.py index 3b86bb2d..6a6d9ffb 100644 --- a/keystone-moon/keystone/tests/unit/test_ssl.py +++ b/keystone-moon/keystone/tests/unit/test_ssl.py @@ -19,21 +19,21 @@ import ssl from oslo_config import cfg from keystone.common import environment -from keystone.tests import unit as tests +from keystone.tests import unit from keystone.tests.unit.ksfixtures import appserver CONF = cfg.CONF -CERTDIR = tests.dirs.root('examples', 'pki', 'certs') -KEYDIR = tests.dirs.root('examples', 'pki', 'private') +CERTDIR = unit.dirs.root('examples', 'pki', 'certs') +KEYDIR = unit.dirs.root('examples', 'pki', 'private') CERT = os.path.join(CERTDIR, 'ssl_cert.pem') KEY = os.path.join(KEYDIR, 'ssl_key.pem') CA = os.path.join(CERTDIR, 'cacert.pem') CLIENT = os.path.join(CERTDIR, 'middleware.pem') -class SSLTestCase(tests.TestCase): +class SSLTestCase(unit.TestCase): def setUp(self): super(SSLTestCase, self).setUp() raise self.skipTest('SSL Version and Ciphers cannot be configured ' -- cgit 1.2.3-korg