openstack/keystone
Code Issues Proposed changes

Merge "Configurable temporary directory for tests"

Browse Source
This commit is contained in:
Jenkins 2014-03-12 00:55:55 +00:00 committed by Gerrit Code Review
commit 8c8a8a657d
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keystone/tests/backend_sql_disk.conf
View File

@ -1,2 +0,0 @@
[database]
connection = sqlite:///keystone/tests/tmp/test.db

11
keystone/tests/core.py
View File

@ -81,7 +81,16 @@ TESTSDIR = os.path.dirname(os.path.abspath(__file__))
ROOTDIR = os.path.normpath(os.path.join(TESTSDIR, '..', '..')) ROOTDIR = os.path.normpath(os.path.join(TESTSDIR, '..', '..'))
VENDOR = os.path.join(ROOTDIR, 'vendor') VENDOR = os.path.join(ROOTDIR, 'vendor')
ETCDIR = os.path.join(ROOTDIR, 'etc') ETCDIR = os.path.join(ROOTDIR, 'etc')
TMPDIR = os.path.join(TESTSDIR, 'tmp')
def _calc_tmpdir():
env_val = os.environ.get('KEYSTONE_TEST_TEMP_DIR')
if env_val:
return env_val
return os.path.join(TESTSDIR, 'tmp')
TMPDIR = _calc_tmpdir()
CONF = config.CONF CONF = config.CONF

7
keystone/tests/test_auth_plugin.py
View File

@ -69,9 +69,13 @@ class TestAuthPlugin(tests.TestCase):
return [tests.dirs.etc('keystone.conf.sample'), return [tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'), tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_sql.conf'), tests.dirs.tests('backend_sql.conf'),
tests.dirs.tests('backend_sql_disk.conf'),
tests.dirs.tests('test_auth_plugin.conf')] tests.dirs.tests('test_auth_plugin.conf')]
def config(self, config_files):
super(TestAuthPlugin, self).config(config_files)
db_conn = 'sqlite:///%s' % tests.dirs.tmp('test.db')
self.config_fixture.config(group='database', connection=db_conn)
def test_unsupported_auth_method(self): def test_unsupported_auth_method(self):
method_name = uuid.uuid4().hex method_name = uuid.uuid4().hex
auth_data = {'methods': [method_name]} auth_data = {'methods': [method_name]}
@ -126,7 +130,6 @@ class TestByClassNameAuthMethodRegistration(TestAuthPlugin):
return [tests.dirs.etc('keystone.conf.sample'), return [tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'), tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_sql.conf'), tests.dirs.tests('backend_sql.conf'),
tests.dirs.tests('backend_sql_disk.conf'),
tests.dirs.tests('test_auth_plugin_by_class_name.conf')] tests.dirs.tests('test_auth_plugin_by_class_name.conf')]

8
keystone/tests/test_v3.py
View File

@ -40,8 +40,7 @@ TIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ'
class RestfulTestCase(rest.RestfulTestCase): class RestfulTestCase(rest.RestfulTestCase):
_config_file_list = [tests.dirs.etc('keystone.conf.sample'), _config_file_list = [tests.dirs.etc('keystone.conf.sample'),
tests.dirs.tests('test_overrides.conf'), tests.dirs.tests('test_overrides.conf'),
tests.dirs.tests('backend_sql.conf'), tests.dirs.tests('backend_sql.conf')]
tests.dirs.tests('backend_sql_disk.conf')]
#Subclasses can override this to specify the complete list of configuration #Subclasses can override this to specify the complete list of configuration
#files. The base version makes a copy of the original values, otherwise #files. The base version makes a copy of the original values, otherwise
@ -90,6 +89,11 @@ class RestfulTestCase(rest.RestfulTestCase):
self.addCleanup(self.teardown_database) self.addCleanup(self.teardown_database)
def config(self, config_files):
super(RestfulTestCase, self).config(config_files)
db_conn = 'sqlite:///%s' % tests.dirs.tmp('test.db')
self.config_fixture.config(group='database', connection=db_conn)
def load_backends(self): def load_backends(self):
self.setup_database() self.setup_database()