diff --git a/zaqar/storage/utils.py b/zaqar/storage/utils.py index 087d01d6c..c7b219955 100644 --- a/zaqar/storage/utils.py +++ b/zaqar/storage/utils.py @@ -64,13 +64,11 @@ def dynamic_conf(uri, options, conf=None): driver_opts = utils.dict_to_conf({'message_store': storage_type}) conf.register_opts(driver_opts, group=u'drivers') - conf.set_override('message_store', storage_type, 'drivers', - enforce_type=True) + conf.set_override('message_store', storage_type, 'drivers') for opt in options: if opt in conf[storage_group]: - conf.set_override(opt, options[opt], group=storage_group, - enforce_type=True) + conf.set_override(opt, options[opt], group=storage_group) return conf diff --git a/zaqar/tests/base.py b/zaqar/tests/base.py index b849c3947..e6b632df8 100644 --- a/zaqar/tests/base.py +++ b/zaqar/tests/base.py @@ -110,7 +110,7 @@ class TestBase(testtools.TestCase): test by the tearDown() method. """ for k, v in kw.items(): - self.conf.set_override(k, v, group, enforce_type=True) + self.conf.set_override(k, v, group) def _my_dir(self): return os.path.abspath(os.path.dirname(__file__)) diff --git a/zaqar/tests/unit/storage/sqlalchemy_migration/test_migrations_base.py b/zaqar/tests/unit/storage/sqlalchemy_migration/test_migrations_base.py index 46fb48f8a..db530e564 100644 --- a/zaqar/tests/unit/storage/sqlalchemy_migration/test_migrations_base.py +++ b/zaqar/tests/unit/storage/sqlalchemy_migration/test_migrations_base.py @@ -71,8 +71,7 @@ class BaseWalkMigrationTestCase(object): """ CONF.set_override('uri', str(engine.url), - group='drivers:management_store:sqlalchemy', - enforce_type=True) + group='drivers:management_store:sqlalchemy') def _alembic_command(self, alembic_command, engine, *args, **kwargs): """Most of alembic command return data into output. @@ -81,8 +80,7 @@ class BaseWalkMigrationTestCase(object): """ self.ALEMBIC_CONFIG.stdout = buf = io.StringIO() CONF.set_override('uri', str(engine.url), - group='drivers:management_store:sqlalchemy', - enforce_type=True) + group='drivers:management_store:sqlalchemy') getattr(command, alembic_command)(*args, **kwargs) res = buf.getvalue().strip() @@ -184,8 +182,7 @@ class TestModelsMigrationsSync(t_m.ModelsMigrationsSync): def db_sync(self, engine): CONF.set_override('uri', str(engine.url), - group='drivers:management_store:sqlalchemy', - enforce_type=True) + 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) alembic.command.upgrade(self.ALEMBIC_CONFIG, 'head')