openstack
/
keystone
Code Issues Proposed changes

Use in-memory SQLite for sql migration tests 

Use the new in-memory SQLite support for the migration tests by
default.

Change-Id: I3ef3a6ff5442ebbad039ddb7936095c389454a9e
This commit is contained in:
Morgan Fainberg 2014-03-25 13:40:24 -07:00 committed by Dolph Mathews
parent 748f8bf6ca
commit 1fe72ad843
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keystone/tests/test_sql_upgrade.py
View File

@ -71,12 +71,14 @@ class SqlMigrateBase(tests.SQLDriverOverrides, tests.TestCase):
def setUp(self):
super(SqlMigrateBase, self).setUp()
conn_str = CONF.database.connection
if (conn_str.startswith('sqlite') and
if (conn_str != tests.IN_MEM_DB_CONN_STRING and
conn_str.startswith('sqlite') and
conn_str[10:] == tests.DEFAULT_TEST_DB_FILE):
# Override the default with a DB that is specific to the migration
# tests only if the DB Connection string is the same as the global
# default. This is required so that no conflicts occur due to the
# global default DB already being under migrate control.
# global default DB already being under migrate control. This is
# only needed if the DB is not-in-memory
db_file = tests.dirs.tmp('keystone_migrate_test.db')
self.config_fixture.config(
group='database',