Drop our scoped session sooner to prevent SQLAlchemy re-binding warnings.
This commit is contained in:
parent
16b8e3afd8
commit
9c7688667e
@ -116,6 +116,9 @@ def get_test_app(dump_old_app=True):
|
|||||||
if MGOBLIN_APP and not dump_old_app:
|
if MGOBLIN_APP and not dump_old_app:
|
||||||
return MGOBLIN_APP
|
return MGOBLIN_APP
|
||||||
|
|
||||||
|
Session.rollback()
|
||||||
|
Session.remove()
|
||||||
|
|
||||||
# Remove and reinstall user_dev directories
|
# Remove and reinstall user_dev directories
|
||||||
if os.path.exists(TEST_USER_DEV):
|
if os.path.exists(TEST_USER_DEV):
|
||||||
shutil.rmtree(TEST_USER_DEV)
|
shutil.rmtree(TEST_USER_DEV)
|
||||||
@ -135,9 +138,6 @@ def get_test_app(dump_old_app=True):
|
|||||||
test_app = loadapp(
|
test_app = loadapp(
|
||||||
'config:' + TEST_SERVER_CONFIG)
|
'config:' + TEST_SERVER_CONFIG)
|
||||||
|
|
||||||
Session.rollback()
|
|
||||||
Session.remove()
|
|
||||||
|
|
||||||
# Re-setup celery
|
# Re-setup celery
|
||||||
setup_celery_app(app_config, global_config)
|
setup_celery_app(app_config, global_config)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user