openstack
/
glance
Code Issues Proposed changes

Don't use config option sqlite_db 

Config option sqlite_db is deprecated in
0a1bae9859079fb21a03716be947c5f1da6db0a2, and deprecate
argument sqlite_db in method set_defaults in
18d26125d02c8a017d8541339737981bf242616b, Glance doesn't
use config option sqlite_db's value, but config option
connection instead. For more details about sqlite connection
string, please see:
http://docs.sqlalchemy.org/en/rel_1_0/core/engines.html#sqlite

Change-Id: I6eadd9d0c3c53d1c8a1afb441d5bdf647f4925e0
This commit is contained in:
ChangBo Guo(gcb) 2016-08-16 13:36:09 +08:00
parent 7df813bba4
commit dffbb6165f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glance/tests/integration/v2/base.py
View File

@ -156,8 +156,7 @@ class ApiTest(test_utils.BaseTestCase):
def _setup_database(self):
sql_connection = 'sqlite:////%s/tests.sqlite' % self.test_dir
options.set_defaults(CONF, connection=sql_connection,
sqlite_db='glance.sqlite')
options.set_defaults(CONF, connection=sql_connection)
glance.db.sqlalchemy.api.clear_db_env()
glance_db_env = 'GLANCE_DB_TEST_SQLITE_FILE'
if glance_db_env in os.environ:

3
glance/tests/unit/base.py
View File

@ -64,8 +64,7 @@ class IsolatedUnitTest(StoreClearingUnitTest):
def setUp(self):
super(IsolatedUnitTest, self).setUp()
options.set_defaults(CONF, connection='sqlite://',
sqlite_db='glance.sqlite')
options.set_defaults(CONF, connection='sqlite://')
lockutils.set_defaults(os.path.join(self.test_dir))
self.config(debug=False)