Merge "do not use str(url) to stringify a URL for subsequent use"
This commit is contained in:
commit
8a9bf456ad
@ -69,7 +69,9 @@ class BaseWalkMigrationTestCase(object):
|
||||
database functionality (reset default settings and session cleanup).
|
||||
"""
|
||||
|
||||
CONF.set_override('uri', str(engine.url),
|
||||
CONF.set_override(
|
||||
'uri',
|
||||
engine.url.render_as_string(hide_password=False),
|
||||
group='drivers:management_store:sqlalchemy')
|
||||
|
||||
def _alembic_command(self, alembic_command, engine, *args, **kwargs):
|
||||
@ -78,7 +80,9 @@ class BaseWalkMigrationTestCase(object):
|
||||
We should redefine this setting for getting info.
|
||||
"""
|
||||
self.ALEMBIC_CONFIG.stdout = buf = io.StringIO()
|
||||
CONF.set_override('uri', str(engine.url),
|
||||
CONF.set_override(
|
||||
'uri',
|
||||
engine.url.render_as_string(hide_password=False),
|
||||
group='drivers:management_store:sqlalchemy')
|
||||
|
||||
getattr(command, alembic_command)(*args, **kwargs)
|
||||
@ -180,7 +184,9 @@ class TestModelsMigrationsSync(t_m.ModelsMigrationsSync):
|
||||
return self.engine
|
||||
|
||||
def db_sync(self, engine):
|
||||
CONF.set_override('uri', str(engine.url),
|
||||
CONF.set_override(
|
||||
'uri',
|
||||
engine.url.render_as_string(hide_password=False),
|
||||
group='drivers:management_store:sqlalchemy')
|
||||
script_location = os.path.join(self.mg_path, 'alembic_migrations')
|
||||
self.ALEMBIC_CONFIG.set_main_option('script_location', script_location)
|
||||
|
Loading…
x
Reference in New Issue
Block a user