Update tests and .bzrignore to use tests.sqlite instead of glance.sqlite.
This commit is contained in:
parent
47af47787b
commit
5e35359d45
@ -1,6 +1,6 @@
|
|||||||
*.pyc
|
*.pyc
|
||||||
glance.egg-info
|
glance.egg-info
|
||||||
glance.sqlite
|
tests.sqlite
|
||||||
*.glance-venv
|
*.glance-venv
|
||||||
dist/
|
dist/
|
||||||
ChangeLog
|
ChangeLog
|
||||||
|
@ -39,7 +39,7 @@ done
|
|||||||
|
|
||||||
function run_tests {
|
function run_tests {
|
||||||
# Just run the test suites in current environment
|
# Just run the test suites in current environment
|
||||||
${wrapper} rm -f glance.sqlite
|
${wrapper} rm -f tests.sqlite
|
||||||
${wrapper} $NOSETESTS 2> run_tests.err.log
|
${wrapper} $NOSETESTS 2> run_tests.err.log
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ def runs_sql(func):
|
|||||||
orig_sql_connection = test_obj.sql_connection
|
orig_sql_connection = test_obj.sql_connection
|
||||||
try:
|
try:
|
||||||
if orig_sql_connection.startswith('sqlite'):
|
if orig_sql_connection.startswith('sqlite'):
|
||||||
test_obj.sql_connection = "sqlite:///glance.sqlite"
|
test_obj.sql_connection = "sqlite:///tests.sqlite"
|
||||||
func(*a, **kwargs)
|
func(*a, **kwargs)
|
||||||
finally:
|
finally:
|
||||||
test_obj.sql_connection = orig_sql_connection
|
test_obj.sql_connection = orig_sql_connection
|
||||||
|
Loading…
Reference in New Issue
Block a user